From 2aab1d33e125502913075d38d126936d7c2a4a2e Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Sat, 13 Feb 2010 14:45:34 +0000
Subject: gah, more blending fixing.

---
 indra/llrender/llrender.cpp | 8 --------
 indra/llrender/llrender.h   | 2 --
 2 files changed, 10 deletions(-)

(limited to 'indra')

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;
-- 
cgit v1.2.3