RTSS: cloneShaderBasedTechniques - ensure src material is loaded

so there are supported techniques
OGRECave · Jan 4, 2024 · 2feb289 · 2feb289
1 parent e928eda
commit 2feb289
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Components/RTShaderSystem/include/OgreShaderGenerator.h b/Components/RTShaderSystem/include/OgreShaderGenerator.h
@@ -318,7 +318,7 @@ class _OgreRTSSExport ShaderGenerator : public Singleton<ShaderGenerator>, publi
     @param dstMat The destination material
     @return True if successful
     */
-    bool cloneShaderBasedTechniques(const Material& srcMat, Material& dstMat);
+    bool cloneShaderBasedTechniques(Material& srcMat, Material& dstMat);
 
     /** 
     Remove all shader based techniques that created by this shader generator.   

diff --git a/Components/RTShaderSystem/src/OgreShaderGenerator.cpp b/Components/RTShaderSystem/src/OgreShaderGenerator.cpp
@@ -894,7 +894,7 @@ bool ShaderGenerator::removeAllShaderBasedTechniques(const String& materialName,
     return true;
 }
 
-bool ShaderGenerator::cloneShaderBasedTechniques(const Material& srcMat, Material& dstMat)
+bool ShaderGenerator::cloneShaderBasedTechniques(Material& srcMat, Material& dstMat)
 {
     if(&srcMat == &dstMat) return true; // nothing to do
 
@@ -938,6 +938,8 @@ bool ShaderGenerator::cloneShaderBasedTechniques(const Material& srcMat, Materia
     // Clone the render states from source to destination
     //
 
+    srcMat.load(); // ensure supported techniques are loaded
+
     // Check if RTSS techniques exist in the source material
     if (itSrcMatEntry != mMaterialEntriesMap.end())
     {