diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-01-09 10:14:41 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-01-09 10:14:41 +0800 |
commit | f6dec0bf7b9baa990fa26398e77faf5a410b8be6 (patch) | |
tree | 9ed732e6801157018faff52d4782c2688fefdd73 /indra/newview/llviewerdisplay.cpp | |
parent | 0fd4a8b59677e1a85d19308379ab9967345749dc (diff) | |
parent | 3c858d7e2d6633df14df473a918d2fb848403972 (diff) |
Merge tag '7.1.2-release'
source for viewer 7.1.2.7215179142
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
-rw-r--r-- | indra/newview/llviewerdisplay.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index b3c3138d70..9cb1b6b6c1 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -100,6 +100,7 @@ BOOL gResizeShadowTexture = FALSE; BOOL gWindowResized = FALSE; BOOL gSnapshot = FALSE; BOOL gCubeSnapshot = FALSE; +BOOL gSnapshotNoPost = FALSE; BOOL gShaderProfileFrame = FALSE; // This is how long the sim will try to teleport you before giving up. @@ -410,13 +411,13 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) gResizeShadowTexture = FALSE; } + gSnapshot = for_snapshot; + if (LLPipeline::sRenderDeferred) { //hack to make sky show up in deferred snapshots for_snapshot = FALSE; } - gSnapshot = for_snapshot; - LLGLSDefault gls_default; LLGLDepthTest gls_depth(GL_TRUE, GL_TRUE, GL_LEQUAL); |