Fix GL "too many blend modes" crash

H-uru · Apr 22, 2023 · 37abb87 · 37abb87
1 parent 81a80ae
commit 37abb87
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Sources/Plasma/FeatureLib/pfGLPipeline/plGLPipeline.cpp b/Sources/Plasma/FeatureLib/pfGLPipeline/plGLPipeline.cpp
@@ -776,6 +776,7 @@ void plGLPipeline::IRenderBufferSpan(const plIcicle& span,
 
     LOG_GL_ERROR_CHECK("PRE Render failed");
 
+    hsRefCnt_SafeAssign(fCurrMaterial, material);
     mRef->SetupTextureRefs();
 
     /* Vertex Buffer stuff */
@@ -835,7 +836,8 @@ void plGLPipeline::IRenderBufferSpan(const plIcicle& span,
         if (mRef->uPassNumber != -1)
             glUniform1i(mRef->uPassNumber, pass);
 
-        plLayerInterface* lay = material->GetLayer(mRef->GetPassIndex(pass));
+        fCurrLayerIdx = mRef->GetPassIndex(pass);
+        plLayerInterface* lay = material->GetLayer(fCurrLayerIdx);
 
         ICalcLighting(mRef, lay, &span);
 
@@ -1053,7 +1055,7 @@ void plGLPipeline::IHandleBlendMode(hsGMatState flags)
 
             default:
                 {
-                    hsAssert(false, "Too many blend modes specified in material");
+                    hsAssert(false, ST::format("Too many blend modes specified in material {}", fCurrMaterial->GetKeyName()).c_str());
 
                     plLayer* lay = plLayer::ConvertNoRef(fCurrMaterial->GetLayer(fCurrLayerIdx)->BottomOfStack());
                     if (lay) {