summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-13 14:45:34 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-13 14:45:34 +0000
commit2aab1d33e125502913075d38d126936d7c2a4a2e (patch)
tree643f2594f3d255717fc2d6eeabbbd62689e0e187 /indra/llrender
parent848f0ad183180ef5860038b1b709a3fdaa31aa3e (diff)
gah, more blending fixing.
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llrender.cpp8
-rw-r--r--indra/llrender/llrender.h2
2 files changed, 0 insertions, 10 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index e701b96a1e..57e7dbe77d 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -765,7 +765,6 @@ LLRender::LLRender()
mCurrAlphaFunc = CF_DEFAULT;
mCurrAlphaFuncVal = 0.01f;
- mCurrSceneBlendType = BT_ALPHA;
mCurrBlendSFactor = BF_UNDEF;
mCurrBlendDFactor = BF_UNDEF;
@@ -927,12 +926,6 @@ void LLRender::setColorMask(bool writeColorR, bool writeColorG, bool writeColorB
void LLRender::setSceneBlendType(eBlendType type)
{
- if (mCurrSceneBlendType == type)
- {
- return;
- }
-
- flush();
switch (type)
{
case BT_ALPHA:
@@ -960,7 +953,6 @@ void LLRender::setSceneBlendType(eBlendType type)
llerrs << "Unknown Scene Blend Type: " << type << llendl;
break;
}
- mCurrSceneBlendType = type;
}
void LLRender::setAlphaRejectSettings(eCompareFunc func, F32 value)
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index e9ffba9efe..df24c985bd 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -362,8 +362,6 @@ private:
std::vector<LLTexUnit*> mTexUnits;
LLTexUnit* mDummyTexUnit;
- U32 mCurrSceneBlendType;
-
F32 mMaxAnisotropy;
eBlendFactor mCurrBlendSFactor;