diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-01 13:10:45 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-01 13:10:45 +0200 |
| commit | b3641c35fe00ea93887ea8980bf69624c8299267 (patch) | |
| tree | 9b575e425986b3f0496192e95009ba2297158de3 /indra/newview/lldrawpoolsky.cpp | |
| parent | 2e2d65cd10a9b2664d3ce020ef7e7e4de3d6705a (diff) | |
| parent | 244bef7d0cdb75f011f70d8cd834154eeb469088 (diff) | |
Merge with default branch
--HG--
branch : product-engine
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(); |