[Regression] Broken Blending during shadow caster passes

Fix setupSharedBasicProperties setting wrong properties for shadow casters. Thanks Eugene for everything! Bug was introduced in 188068f
OGRECave · Aug 23, 2024 · 9df4a3f · 9df4a3f · dyunchik · Aug 23, 2024
1 parent db29ca5
commit 9df4a3f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Components/Hlms/Pbs/src/OgreHlmsPbs.cpp b/Components/Hlms/Pbs/src/OgreHlmsPbs.cpp
@@ -1086,7 +1086,7 @@ namespace Ogre
             }
         }
 
-        setupSharedBasicProperties( renderable );
+        setupSharedBasicProperties( renderable, true );
 
         if( hasAlphaTestOrHash && getProperty( kNoTid, PbsProperty::UseTextureAlpha ) )
         {

diff --git a/Components/Hlms/Unlit/src/OgreHlmsUnlit.cpp b/Components/Hlms/Unlit/src/OgreHlmsUnlit.cpp
@@ -570,7 +570,7 @@ namespace Ogre
             inOutPieces[PixelShader] = normalPassPieces[PixelShader];
         }
 
-        setupSharedBasicProperties( renderable );
+        setupSharedBasicProperties( renderable, true );
 
         if( mFastShaderBuildHack )
             setProperty( kNoTid, UnlitProperty::MaterialsPerBuffer, static_cast<int>( 2 ) );

diff --git a/OgreMain/include/OgreHlms.h b/OgreMain/include/OgreHlms.h
@@ -859,7 +859,7 @@ namespace Ogre
         static bool findParamInVec( const HlmsParamVec &paramVec, IdString key, String &inOut );
 
     protected:
-        void setupSharedBasicProperties( Renderable *renderable );
+        void setupSharedBasicProperties( Renderable *renderable, const bool bCasterPass );
 
     public:
         /** Called by the renderable when either it changes the material,

diff --git a/OgreMain/src/OgreHlms.cpp b/OgreMain/src/OgreHlms.cpp
@@ -2763,7 +2763,7 @@ namespace Ogre
         }
     }
     //-----------------------------------------------------------------------------------
-    void Hlms::setupSharedBasicProperties( Renderable *renderable )
+    void Hlms::setupSharedBasicProperties( Renderable *renderable, const bool bCasterPass )
     {
         HlmsDatablock *datablock = renderable->getDatablock();
 
@@ -2779,9 +2779,9 @@ namespace Ogre
         setProperty( kNoTid, HlmsBaseProp::AlphaTestShadowCasterOnly,
                      datablock->getAlphaTestShadowCasterOnly() );
         setProperty( kNoTid, HlmsBaseProp::AlphaBlend,
-                     datablock->getBlendblock( false )->isAutoTransparent() );
+                     datablock->getBlendblock( bCasterPass )->isAutoTransparent() );
         setProperty( kNoTid, HlmsBaseProp::AlphaToCoverage,
-                     datablock->getBlendblock( false )->mAlphaToCoverage );
+                     datablock->getBlendblock( bCasterPass )->mAlphaToCoverage );
         if( datablock->getAlphaHashing() )
             setProperty( kNoTid, HlmsBaseProp::AlphaHash, 1 );
 
@@ -2857,7 +2857,7 @@ namespace Ogre
 
         setProperty( kNoTid, HlmsBaseProp::UvCount, numTexCoords );
 
-        setupSharedBasicProperties( renderable );
+        setupSharedBasicProperties( renderable, false );
 
         HlmsDatablock *datablock = renderable->getDatablock();