diff options
| author | graham linden <graham@lindenlab.com> | 2013-03-05 13:42:57 -0800 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-03-05 13:42:57 -0800 |
| commit | 046014aa10e535bfa18e3d7b4c2da70284a615ae (patch) | |
| tree | a2ddc78c2da49f22ae6c11195b0fbc5c27e32e5b /indra/newview/lldrawpoolbump.cpp | |
| parent | b19eeabd54afcfb56e864899c166b64db1ac6790 (diff) | |
| parent | a65c275865f1cc9bf53237e4b8c99a7bee3731ee (diff) | |
Merged lindenlab/viewer-cat into default
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 4137084ebe..7e95046479 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -461,6 +461,8 @@ void LLDrawPoolBump::unbindCubeMap(LLGLSLShader* shader, S32 shader_level, S32& } } } + // Moved below shader->disableTexture call to avoid false alarms from auto-re-enable of textures on stage 0 + // MAINT-755 cube_map->disable(); cube_map->restoreMatrix(); } |