summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorPalmer Truelson <palmer@lindenlab.com>2010-02-23 21:51:25 -0800
committerPalmer Truelson <palmer@lindenlab.com>2010-02-23 21:51:25 -0800
commit2f785135bc39575ec306b2b057e446e61c5369d7 (patch)
tree8c2e6a03962b24700694c6887dacd1558df7cde9 /indra/llrender
parent31e4b6e79ccd0a0451de3fa6a487f775d9f45497 (diff)
parentb214180ac189f6c6347347c5d3a5dc7035e0c039 (diff)
Merge with viewer 2.
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llrender.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index df24c985bd..73c628d4b5 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -362,6 +362,8 @@ private:
std::vector<LLTexUnit*> mTexUnits;
LLTexUnit* mDummyTexUnit;
+ eBlendFactor mCurrBlendSFactor;
+ eBlendFactor mCurrBlendDFactor;
F32 mMaxAnisotropy;
eBlendFactor mCurrBlendSFactor;