diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 16:09:11 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 16:09:11 -0800 |
| commit | 6d9713e8ed691882180c85e60070d80e1e3eed5e (patch) | |
| tree | a9737f254ef00900ec40120b020621ad64e198c3 /indra/newview/lldrawpoolsky.cpp | |
| parent | 0bb7a85d06e7201887962000cb3e91bf456ffa09 (diff) | |
| parent | 682f8afcc073b62fed64a3fd2adc5f65793e1f3e (diff) | |
merge from viewer2.
Diffstat (limited to 'indra/newview/lldrawpoolsky.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolsky.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp index 8428be194f..0f76165053 100644 --- a/indra/newview/lldrawpoolsky.cpp +++ b/indra/newview/lldrawpoolsky.cpp @@ -48,8 +48,11 @@ #include "pipeline.h" #include "llviewershadermgr.h" -LLDrawPoolSky::LLDrawPoolSky() : - LLFacePool(POOL_SKY), mShader(NULL) +LLDrawPoolSky::LLDrawPoolSky() +: LLFacePool(POOL_SKY), + + mSkyTex(NULL), + mShader(NULL) { } @@ -132,6 +135,7 @@ void LLDrawPoolSky::renderSkyCubeFace(U8 side) return; } + llassert(mSkyTex); mSkyTex[side].bindTexture(TRUE); face.renderIndexed(); |