Merge tag 'Second_Life_Release#3d465f6c-26.3' into 26.3

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index f4c121c18b..c36c5c6d29 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -9889,6 +9889,9 @@ void LLPipeline::renderShadow(const glm::mat4& view, const glm::mat4& proj, LLCa
     LL_PROFILE_GPU_ZONE("renderShadow");
 
     LLPipeline::sShadowRender = true;
+    // Shadow binds aren't visibility. RAII (not a hardcoded restore) so a shadow
+    // pass nested in a probe render doesn't re-enable stamping for the rest of it.
+    LLImageGLStampBypass stamp_bypass;
 
     // disable occlusion culling during shadow render
     U32 saved_occlusion = sUseOcclusion;
@@ -11315,6 +11318,9 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar, bool preview_avatar, bool
 
     sShadowRender = true;
     sImpostorRender = true;
+    // Impostor binds aren't visibility. RAII so the nested shadow pass can't
+    // re-enable stamping mid-render.
+    LLImageGLStampBypass stamp_bypass;
 
     LLViewerCamera* viewer_camera = LLViewerCamera::getInstance();