diff options
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 774ca2e8e7..7b9fb2b34b 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -786,7 +786,7 @@ void LLDrawPoolBump::endBump(U32 pass) { // Disable texture blending on unit 1 gGL.getTexUnit(1)->activate(); - //gGL.getTexUnit(1)->disable(); + gGL.getTexUnit(1)->disable(); gGL.getTexUnit(1)->setTextureBlendType(LLTexUnit::TB_MULT); // Disable texture blending on unit 0 diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index cef4c649d7..04edc90be9 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -701,6 +701,9 @@ void LLPipeline::allocateScreenBuffer(U32 resX, U32 resY) bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY, U32 samples) { + refreshCachedSettings(); + refreshRenderDeferred(); + // remember these dimensions mScreenWidth = resX; mScreenHeight = resY; @@ -8435,6 +8438,7 @@ void LLPipeline::generateSunShadow(LLCamera& camera) BOOL skip_avatar_update = FALSE; if (!isAgentAvatarValid() || gAgentCamera.getCameraAnimating() || gAgentCamera.getCameraMode() != CAMERA_MODE_MOUSELOOK || !LLVOAvatar::sVisibleInFirstPerson) { + skip_avatar_update = TRUE; } |