diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 17:12:57 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 17:12:57 -0800 |
| commit | 04bfd00a5d8ae7326211d867af7c3f577ff06763 (patch) | |
| tree | b0547199d04dc7ccec94b451f05b5ce7e24e3703 /indra/newview/lldrawpoolsky.cpp | |
| parent | aaae230bb135b9e57edb12a7374c711fd7e4adb4 (diff) | |
| parent | 7e0a3ce7359a01ffa7776d86f279409225c3c2a7 (diff) | |
merge.
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(); |