Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LLDrawPoolWater::shade no longer binds diffuse texture if nonexistant or unused by shader. (was firing a warning upon bind)

Browse Source
This commit is contained in:
Shyotl
2011-04-23 00:59:20 -05:00
parent 0b1b7c6618
commit f190644464
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/lldrawpoolwater.cpp
View File

@@ -552,7 +552,8 @@ void LLDrawPoolWater::shade()
} }
LLVOWater* water = (LLVOWater*) face->getViewerObject(); LLVOWater* water = (LLVOWater*) face->getViewerObject();
gGL.getTexUnit(diffTex)->bind(face->getTexture()); if(diffTex > -1 && face->getTexture()->getHasGLTexture())
gGL.getTexUnit(diffTex)->bind(face->getTexture());
sNeedsReflectionUpdate = TRUE; sNeedsReflectionUpdate = TRUE;
@@ -570,6 +571,8 @@ void LLDrawPoolWater::shade()
LLGLSquashToFarClip far_clip(glh_get_current_projection()); LLGLSquashToFarClip far_clip(glh_get_current_projection());
face->renderIndexed(); face->renderIndexed();
} }
if(diffTex > -1 && face->getTexture()->getHasGLTexture())
gGL.getTexUnit(diffTex)->unbind(LLTexUnit::TT_TEXTURE);
} }
} }