Skip to content
Snippets Groups Projects
Commit 38ad100a authored by Graham Madarasz (Graham Linden)'s avatar Graham Madarasz (Graham Linden)
Browse files

NORSPEC-73 mac crash on startup with RenderDebugGL on due to false alarm from cubemap unbind

parent a1a66996
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/lldrawpoolbump.cpp
+ 2
− 3
View file @ 38ad100a
...@@ -449,9 +449,6 @@ void LLDrawPoolBump::unbindCubeMap(LLGLSLShader* shader, S32 shader_level, S32& ...@@ -449,9 +449,6 @@ void LLDrawPoolBump::unbindCubeMap(LLGLSLShader* shader, S32 shader_level, S32&
LLCubeMap* cube_map = gSky.mVOSkyp ? gSky.mVOSkyp->getCubeMap() : NULL; LLCubeMap* cube_map = gSky.mVOSkyp ? gSky.mVOSkyp->getCubeMap() : NULL;
if( cube_map ) if( cube_map )
{ {
cube_map->disable();
cube_map->restoreMatrix();
if (!invisible && shader_level > 1) if (!invisible && shader_level > 1)
{ {
shader->disableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP); shader->disableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP);
...@@ -464,6 +461,8 @@ void LLDrawPoolBump::unbindCubeMap(LLGLSLShader* shader, S32 shader_level, S32& ...@@ -464,6 +461,8 @@ void LLDrawPoolBump::unbindCubeMap(LLGLSLShader* shader, S32 shader_level, S32&
} }
} }
} }
cube_map->disable();
cube_map->restoreMatrix();
} }
if (!LLGLSLShader::sNoFixedFunction) if (!LLGLSLShader::sNoFixedFunction)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment