Skip to content
Snippets Groups Projects
Commit 3adbe19d authored by Kitty Barnett's avatar Kitty Barnett
Browse files

Merge branch 'rlva/development' into rlva/development

parents 5f6c7c6e 273ebfe0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/lldrawpooltree.cpp
+ 1
− 1
View file @ 3adbe19d
...@@ -94,7 +94,7 @@ void LLDrawPoolTree::render(S32 pass) ...@@ -94,7 +94,7 @@ void LLDrawPoolTree::render(S32 pass)
LLGLState test(GL_ALPHA_TEST, LLGLSLShader::sNoFixedFunction ? 0 : 1); LLGLState test(GL_ALPHA_TEST, LLGLSLShader::sNoFixedFunction ? 0 : 1);
// [SL:KB] - Patch: Render-TextureToggle (Catznip-4.0) // [SL:KB] - Patch: Render-TextureToggle (Catznip-4.0)
LLViewerTexture* pTexture = (LLPipeline::sRenderTextures) ? mTexturep : LLViewerFetchedTexture::sDefaultDiffuseImagep; LLViewerTexture* pTexture = (LLPipeline::sRenderTextures) ? mTexturep.get() : LLViewerFetchedTexture::sDefaultDiffuseImagep.get();
gGL.getTexUnit(sDiffTex)->bind(pTexture); gGL.getTexUnit(sDiffTex)->bind(pTexture);
// [/SL:KB] // [/SL:KB]
// gGL.getTexUnit(sDiffTex)->bind(mTexturep); // gGL.getTexUnit(sDiffTex)->bind(mTexturep);
......
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