diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-01 17:13:27 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-01 17:13:27 -0700 |
| commit | c6e414009a824ce9b0600af6d3c8c1739f58a142 (patch) | |
| tree | 6f32081cf89500e8bf42814cf5fbdf777d762b01 /indra/newview/lldrawpoolwlsky.cpp | |
| parent | 83c2692ffcde2409ed983cb82a1b4d3fc759f72b (diff) | |
| parent | c6b4b81bf2ceac0d5152c15ba86af09bb4dca183 (diff) | |
Merge
Diffstat (limited to 'indra/newview/lldrawpoolwlsky.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwlsky.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp index a796052635..5104dc18fd 100644 --- a/indra/newview/lldrawpoolwlsky.cpp +++ b/indra/newview/lldrawpoolwlsky.cpp @@ -392,8 +392,8 @@ void LLDrawPoolWLSky::renderHeavenlyBodies() if (gSky.mVOSkyp->getSun().getDraw() && face && face->getGeomCount()) { - LLViewerTexture* tex_a = face->getTexture(LLRender::DIFFUSE_MAP); - LLViewerTexture* tex_b = face->getTexture(LLRender::ALTERNATE_DIFFUSE_MAP); + LLPointer<LLViewerTexture> tex_a = face->getTexture(LLRender::DIFFUSE_MAP); + LLPointer<LLViewerTexture> tex_b = face->getTexture(LLRender::ALTERNATE_DIFFUSE_MAP); gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); gGL.getTexUnit(1)->unbind(LLTexUnit::TT_TEXTURE); |