diff options
author | Oz Linden <oz@lindenlab.com> | 2012-08-14 09:01:56 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-08-14 09:01:56 -0400 |
commit | 24c1b62e27e066dc62e7681593ce7c93ee84d5a8 (patch) | |
tree | 76d5b8a1c4eb43073e85156d74e8f3eac11dfe74 /indra/llrender/llglstates.h | |
parent | 2c2167229eac3efd7e7b1c5eafde8ee2e66184cd (diff) | |
parent | 337976096530729a7d671df68907cd59a7986972 (diff) |
merge back beta fixes
Diffstat (limited to 'indra/llrender/llglstates.h')
-rw-r--r-- | indra/llrender/llglstates.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llrender/llglstates.h b/indra/llrender/llglstates.h index e26aead676..0e2c3bcb44 100644 --- a/indra/llrender/llglstates.h +++ b/indra/llrender/llglstates.h @@ -59,7 +59,6 @@ protected: LLGLEnable mColorMaterial; LLGLDisable mAlphaTest, mBlend, mCullFace, mDither, mFog, mLineSmooth, mLineStipple, mNormalize, mPolygonSmooth, - mTextureGenQ, mTextureGenR, mTextureGenS, mTextureGenT, mGLMultisample; public: LLGLSDefault() @@ -76,10 +75,6 @@ public: mLineStipple(GL_LINE_STIPPLE), mNormalize(GL_NORMALIZE), mPolygonSmooth(GL_POLYGON_SMOOTH), - mTextureGenQ(GL_TEXTURE_GEN_Q), - mTextureGenR(GL_TEXTURE_GEN_R), - mTextureGenS(GL_TEXTURE_GEN_S), - mTextureGenT(GL_TEXTURE_GEN_T), mGLMultisample(GL_MULTISAMPLE_ARB) { } }; |