Game Engine: alpha blending and sorting

=======================================

Alpha blending + sorting was revised, to fix bugs and get it
to work more predictable.

* A new per texture face "Sort" setting defines if the face
  is alpha sorted or not, instead of abusing the "ZTransp"
  setting as it did before.
* Existing files are converted to hopefully match the old
  behavior as much as possible with a version patch.
* On new meshes the Sort flag is disabled by the default, to
  avoid unexpected and hard to find slowdowns.
* Alpha sorting for faces was incredibly slow. Sorting faces
  in a mesh with 600 faces lowered the framerate from 200 to
  70 fps in my test.. the sorting there case goes about 15x
  faster now, but it is still advised to use Clip Alpha if
  possible instead of regular Alpha.
* There still various limitations in the alpha sorting code,
  I've added some comments to the code about this.

Some docs at the bottom of the page:
http://www.blender.org/development/current-projects/changes-since-246/realtime-glsl-materials/

Merged some fixes from the apricot branch, most important
change is that  tangents are now exactly the same as the rest
of Blender, instead of being computed in the game engine with a
different algorithm.

Also, the subversion was bumped to 1.

11 files changed, 192 insertions, 94 deletions

diff --git a/source/gameengine/Ketsji/BL_BlenderShader.cpp b/source/gameengine/Ketsji/BL_BlenderShader.cpp
index dd45d522b9f..a9a0771936c 100644
--- a/source/gameengine/Ketsji/BL_BlenderShader.cpp
+++ b/source/gameengine/Ketsji/BL_BlenderShader.cpp
@@ -1,6 +1,10 @@
 
 #include "DNA_customdata_types.h"
 #include "DNA_material_types.h"
+#include "DNA_scene_types.h"
+
+#include "BKE_global.h"
+#include "BKE_main.h"
 
 #include "BL_BlenderShader.h"
 #include "BL_Material.h"
@@ -10,30 +14,51 @@
 #include "GPU_material.h"
 #endif
 
+#include "RAS_BucketManager.h"
 #include "RAS_MeshObject.h"
 #include "RAS_IRasterizer.h"
+ 
+ /* this is evil, but we need the scene to create materials with
+  * lights from the correct scene .. */
+static struct Scene *GetSceneForName(const STR_String& scenename)
+{
+	Scene *sce;
+
+	for (sce= (Scene*)G.main->scene.first; sce; sce= (Scene*)sce->id.next)
+		if (scenename == (sce->id.name+2))
+			return sce;
 
-const bool BL_BlenderShader::Ok()const
+	return (Scene*)G.main->scene.first;
+}
+
+bool BL_BlenderShader::Ok()
 {
 #ifdef BLENDER_GLSL
-	return (mGPUMat != 0);
+	VerifyShader();
+
+	return (mMat && mMat->gpumaterial);
 #else
 	return 0;
 #endif
 }
 
-BL_BlenderShader::BL_BlenderShader(struct Material *ma, int lightlayer)
+BL_BlenderShader::BL_BlenderShader(KX_Scene *scene, struct Material *ma, int lightlayer)
 :
 #ifdef BLENDER_GLSL
-	mGPUMat(0),
+	mScene(scene),
+	mMat(ma),
+	mGPUMat(NULL),
 #endif
 	mBound(false),
 	mLightLayer(lightlayer)
 {
 #ifdef BLENDER_GLSL
-	if(ma) {
-		GPU_material_from_blender(ma);
-		mGPUMat = ma->gpumaterial;
+	mBlenderScene = GetSceneForName(scene->GetName());
+	mBlendMode = GPU_BLEND_SOLID;
+
+	if(mMat) {
+		GPU_material_from_blender(mBlenderScene, mMat);
+		mGPUMat = mMat->gpumaterial;
 	}
 #endif
 }
@@ -41,17 +66,29 @@ BL_BlenderShader::BL_BlenderShader(struct Material *ma, int lightlayer)
 BL_BlenderShader::~BL_BlenderShader()
 {
 #ifdef BLENDER_GLSL
-	if(mGPUMat) {
-		GPU_material_unbind(mGPUMat);
-		mGPUMat = 0;
-	}
+	if(mMat && mMat->gpumaterial)
+		GPU_material_unbind(mMat->gpumaterial);
+#endif
+}
+
+bool BL_BlenderShader::VerifyShader()
+{
+#ifdef BLENDER_GLSL
+	if(mMat && !mMat->gpumaterial)
+		GPU_material_from_blender(mBlenderScene, mMat);
+
+	mGPUMat = mMat->gpumaterial;
+	
+	return (mMat && mGPUMat);
+#else
+	return false;
 #endif
 }
 
 void BL_BlenderShader::SetProg(bool enable)
 {
 #ifdef BLENDER_GLSL
-	if(mGPUMat) {
+	if(VerifyShader()) {
 		if(enable) {
 			GPU_material_bind(mGPUMat, mLightLayer);
 			mBound = true;
@@ -70,7 +107,7 @@ int BL_BlenderShader::GetAttribNum()
 	GPUVertexAttribs attribs;
 	int i, enabled = 0;
 
-	if(!mGPUMat)
+	if(!VerifyShader())
 		return enabled;
 
 	GPU_material_vertex_attributes(mGPUMat, &attribs);
@@ -96,7 +133,7 @@ void BL_BlenderShader::SetAttribs(RAS_IRasterizer* ras, const BL_Material *mat)
 
 	ras->SetAttribNum(0);
 
-	if(!mGPUMat)
+	if(!VerifyShader())
 		return;
 
 	if(ras->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED) {
@@ -142,9 +179,11 @@ void BL_BlenderShader::SetAttribs(RAS_IRasterizer* ras, const BL_Material *mat)
 void BL_BlenderShader::Update( const KX_MeshSlot & ms, RAS_IRasterizer* rasty )
 {
 #ifdef BLENDER_GLSL
-	float obmat[4][4], viewmat[4][4], viewinvmat[4][4];
+	float obmat[4][4], viewmat[4][4], viewinvmat[4][4], obcol[4];
+
+	VerifyShader();
 
-	if(!mGPUMat || !mBound)
+	if(!mGPUMat) // || !mBound)
 		return;
 
 	MT_Matrix4x4 model;
@@ -158,10 +197,22 @@ void BL_BlenderShader::Update( const KX_MeshSlot & ms, RAS_IRasterizer* rasty )
 	view.invert();
 	view.getValue((float*)viewinvmat);
 
-	GPU_material_bind_uniforms(mGPUMat, obmat, viewmat, viewinvmat);
+	if(ms.m_bObjectColor)
+		ms.m_RGBAcolor.getValue((float*)obcol);
+	else
+		obcol[0]= obcol[1]= obcol[2]= obcol[3]= 1.0f;
+
+	GPU_material_bind_uniforms(mGPUMat, obmat, viewmat, viewinvmat, obcol);
+
+	mBlendMode = GPU_material_blend_mode(mGPUMat, obcol);
 #endif
 }
 
+int BL_BlenderShader::GetBlendMode()
+{
+	return mBlendMode;
+}
+
 bool BL_BlenderShader::Equals(BL_BlenderShader *blshader)
 {
 #ifdef BLENDER_GLSL
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.h b/source/gameengine/Ketsji/BL_BlenderShader.h
index b758d1a9cba..da9765dafa4 100644
--- a/source/gameengine/Ketsji/BL_BlenderShader.h
+++ b/source/gameengine/Ketsji/BL_BlenderShader.h
@@ -14,7 +14,10 @@
 
 #include "RAS_IPolygonMaterial.h"
 
+#include "KX_Scene.h"
+
 struct Material;
+struct Scene;
 class BL_Material;
 
 #define BL_MAX_ATTRIB	16
@@ -27,21 +30,28 @@ class BL_BlenderShader
 {
 private:
 #ifdef BLENDER_GLSL
+	KX_Scene		*mScene;
+	struct Scene	*mBlenderScene;
+	struct Material	*mMat;
 	GPUMaterial		*mGPUMat;
 #endif
 	bool			mBound;
 	int				mLightLayer;
+	int				mBlendMode;
+
+	bool			VerifyShader();
 
 public:
-	BL_BlenderShader(struct Material *ma, int lightlayer);
+	BL_BlenderShader(KX_Scene *scene, struct Material *ma, int lightlayer);
 	virtual ~BL_BlenderShader();
 
-	const bool			Ok()const;
+	bool				Ok();
 	void				SetProg(bool enable);
 
 	int GetAttribNum();
 	void SetAttribs(class RAS_IRasterizer* ras, const BL_Material *mat);
 	void Update(const class KX_MeshSlot & ms, class RAS_IRasterizer* rasty);
+	int GetBlendMode();
 
 	bool Equals(BL_BlenderShader *blshader);
 };
diff --git a/source/gameengine/Ketsji/BL_Material.h b/source/gameengine/Ketsji/BL_Material.h
index 568f7e171de..dcb66ea2579 100644
--- a/source/gameengine/Ketsji/BL_Material.h
+++ b/source/gameengine/Ketsji/BL_Material.h
@@ -129,8 +129,7 @@ enum BL_flag
 	TEXALPHA=8,		// use alpha combiner functions
 	TEXNEG=16,		// negate blending
 	HASIPO=32,
-	USENEGALPHA=64,
-	ALPHA_TEST=128
+	USENEGALPHA=64
 };
 
 // BL_Material::ras_mode
@@ -139,7 +138,7 @@ enum BL_ras_mode
 	POLY_VIS=1,
 	COLLIDER=2,
 	ZSORT=4,
-	TRANSP=8,
+	ALPHA=8,
 	TRIANGLE=16,
 	USE_LIGHT=32,
 	WIRE=64
diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp
index f24ef4322f0..f0ef84032f7 100644
--- a/source/gameengine/Ketsji/BL_Texture.cpp
+++ b/source/gameengine/Ketsji/BL_Texture.cpp
@@ -384,8 +384,6 @@ void BL_Texture::DisableUnit()
 
 void BL_Texture::DisableAllTextures()
 {
-	glDisable(GL_BLEND);
-
 	for(int i=0; i<MAXTEX; i++) {
 		if(GLEW_ARB_multitexture)
 			glActiveTextureARB(GL_TEXTURE0_ARB+i);
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
index 0f445a9f32e..a67e5b26667 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
@@ -38,6 +38,7 @@ extern "C" {
 // ------------------------------------
 #define spit(x) std::cout << x << std::endl;
 
+BL_Shader *KX_BlenderMaterial::mLastShader = NULL;
 BL_BlenderShader *KX_BlenderMaterial::mLastBlenderShader = NULL;
 
 //static PyObject *gTextureDict = 0;
@@ -58,7 +59,8 @@ KX_BlenderMaterial::KX_BlenderMaterial(
 		data->tilexrep[0],
 		data->tileyrep[0],
 		data->mode,
-		((data->ras_mode &TRANSP)!=0),
+		data->transp,
+		((data->ras_mode &ALPHA)!=0),
 		((data->ras_mode &ZSORT)!=0),
 		lightlayer,
 		((data->ras_mode &TRIANGLE)!=0),
@@ -79,7 +81,6 @@ KX_BlenderMaterial::KX_BlenderMaterial(
 	m_flag |=RAS_BLENDERMAT;
 	m_flag |=(mMaterial->IdMode>=ONETEX)?RAS_MULTITEX:0;
 	m_flag |=(mMaterial->ras_mode & USE_LIGHT)!=0?RAS_MULTILIGHT:0;
-	m_flag |=(mMaterial->ras_mode &ALPHA_TEST)!=0?RAS_FORCEALPHA:0;
 
 	// figure max
 	int enabled = mMaterial->num_enabled;
@@ -158,12 +159,29 @@ void KX_BlenderMaterial::OnConstruction()
 	mConstructed = true;
 }
 
+void KX_BlenderMaterial::EndFrame()
+{
+	if(mLastBlenderShader) {
+		mLastBlenderShader->SetProg(false);
+		mLastBlenderShader = NULL;
+	}
+
+	if(mLastShader) {
+		mLastShader->SetProg(false);
+		mLastShader = NULL;
+	}
+}
+
 void KX_BlenderMaterial::OnExit()
 {
 	if( mShader ) {
-		 //note, the shader here is allocated, per unique material
-		 //and this function is called per face
-		mShader->SetProg(false);
+		//note, the shader here is allocated, per unique material
+		//and this function is called per face
+		if(mShader == mLastShader) {
+			mShader->SetProg(false);
+			mLastShader = NULL;
+		}
+
 		delete mShader;
 		mShader = 0;
 	}
@@ -197,13 +215,19 @@ void KX_BlenderMaterial::setShaderData( bool enable, RAS_IRasterizer *ras)
 	int i;
 	if( !enable || !mShader->Ok() ) {
 		// frame cleanup.
-		mShader->SetProg(false);
+		if(mShader == mLastShader) {
+			mShader->SetProg(false);
+			mLastShader = NULL;
+		}
+
+		ras->SetBlendingMode(TF_SOLID);
 		BL_Texture::DisableAllTextures();
 		return;
 	}
 
 	BL_Texture::DisableAllTextures();
 	mShader->SetProg(true);
+	mLastShader = mShader;
 	
 	BL_Texture::ActivateFirst();
 
@@ -217,9 +241,12 @@ void KX_BlenderMaterial::setShaderData( bool enable, RAS_IRasterizer *ras)
 	}
 
 	if(!mUserDefBlend) {
-		setDefaultBlending();
+		ras->SetBlendingMode(mMaterial->transp);
 	}
 	else {
+		ras->SetBlendingMode(TF_SOLID);
+		ras->SetBlendingMode(-1); // indicates custom mode
+
 		// tested to be valid enums
 		glEnable(GL_BLEND);
 		glBlendFunc(mBlendFunc[0], mBlendFunc[1]);
@@ -234,11 +261,14 @@ void KX_BlenderMaterial::setBlenderShaderData( bool enable, RAS_IRasterizer *ras
 			mLastBlenderShader->SetProg(false);
 			mLastBlenderShader= NULL;
 		}
+
+		ras->SetBlendingMode(TF_SOLID);
 		BL_Texture::DisableAllTextures();
 		return;
 	}
 
 	if(!mBlenderShader->Equals(mLastBlenderShader)) {
+		ras->SetBlendingMode(mMaterial->transp);
 		BL_Texture::DisableAllTextures();
 
 		if(mLastBlenderShader)
@@ -251,17 +281,17 @@ void KX_BlenderMaterial::setBlenderShaderData( bool enable, RAS_IRasterizer *ras
 
 void KX_BlenderMaterial::setTexData( bool enable, RAS_IRasterizer *ras)
 {
-	if(GLEW_ARB_shader_objects && mShader) 
-		mShader->SetProg(false);
-
 	BL_Texture::DisableAllTextures();
-	if( !enable )
+
+	if( !enable ) {
+		ras->SetBlendingMode(TF_SOLID);
 		return;
+	}
 
 	BL_Texture::ActivateFirst();
 
 	if( mMaterial->IdMode == DEFAULT_BLENDER ) {
-		setDefaultBlending();
+		ras->SetBlendingMode(mMaterial->transp);
 		return;
 	}
 
@@ -271,7 +301,7 @@ void KX_BlenderMaterial::setTexData( bool enable, RAS_IRasterizer *ras)
 			mTextures[0].ActivateTexture();
 			mTextures[0].setTexEnv(0, true);
 			mTextures[0].SetMapping(mMaterial->mapping[0].mapping);
-			setDefaultBlending(); 
+			ras->SetBlendingMode(mMaterial->transp);
 		}
 		return;
 	}
@@ -294,9 +324,12 @@ void KX_BlenderMaterial::setTexData( bool enable, RAS_IRasterizer *ras)
 	}
 
 	if(!mUserDefBlend) {
-		setDefaultBlending();
+		ras->SetBlendingMode(mMaterial->transp);
 	}
 	else {
+		ras->SetBlendingMode(TF_SOLID);
+		ras->SetBlendingMode(-1); // indicates custom mode
+
 		glEnable(GL_BLEND);
 		glBlendFunc(mBlendFunc[0], mBlendFunc[1]);
 	}
@@ -356,6 +389,11 @@ KX_BlenderMaterial::ActivateBlenderShaders(
 {
 	KX_BlenderMaterial *tmp = const_cast<KX_BlenderMaterial*>(this);
 
+	if(mLastShader) {
+		mLastShader->SetProg(false);
+		mLastShader= NULL;
+	}
+
 	// reset... 
 	if(tmp->mMaterial->IsShared()) 
 		cachingInfo =0;
@@ -402,6 +440,11 @@ KX_BlenderMaterial::ActivateMat(
 {
 	KX_BlenderMaterial *tmp = const_cast<KX_BlenderMaterial*>(this);
 
+	if(mLastShader) {
+		mLastShader->SetProg(false);
+		mLastShader= NULL;
+	}
+
 	if(mLastBlenderShader) {
 		mLastBlenderShader->SetProg(false);
 		mLastBlenderShader= NULL;
@@ -451,7 +494,10 @@ KX_BlenderMaterial::Activate(
 			return dopass;
 		}
 		else {
-			mShader->SetProg(false);
+			if(mShader == mLastShader) {
+				mShader->SetProg(false);
+				mLastShader = NULL;
+			}
 			mPass = 0;
 			dopass = false;
 			return dopass;
@@ -499,10 +545,22 @@ bool KX_BlenderMaterial::UsesLighting(RAS_IRasterizer *rasty) const
 
 void KX_BlenderMaterial::ActivateMeshSlot(const KX_MeshSlot & ms, RAS_IRasterizer* rasty) const
 {
-	if(mShader && GLEW_ARB_shader_objects)
+	if(mShader && GLEW_ARB_shader_objects) {
 		mShader->Update(ms, rasty);
-	else if(mBlenderShader && GLEW_ARB_shader_objects)
+	}
+	else if(mBlenderShader && GLEW_ARB_shader_objects) {
+		int blendmode;
+
 		mBlenderShader->Update(ms, rasty);
+
+		/* we do blend modes here, because they can change per object
+		 * with the same material due to obcolor */
+		blendmode = mBlenderShader->GetBlendMode();
+		if((blendmode == TF_SOLID || blendmode == TF_ALPHA) && mMaterial->transp != TF_SOLID)
+			blendmode = mMaterial->transp;
+
+		rasty->SetBlendingMode(blendmode);
+	}
 }
 
 void KX_BlenderMaterial::ActivatGLMaterials( RAS_IRasterizer* rasty )const
@@ -582,31 +640,6 @@ void KX_BlenderMaterial::ActivateTexGen(RAS_IRasterizer *ras) const
 		ras->EnableTextures(false);
 }
 
-bool KX_BlenderMaterial::setDefaultBlending()
-{
-	if( mMaterial->transp &TF_ADD) {
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_ONE, GL_ONE);
-		glDisable ( GL_ALPHA_TEST );
-		return true;
-	}
-	
-	if( mMaterial->transp & TF_ALPHA ) {
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		glDisable ( GL_ALPHA_TEST );
-		return true;
-	}
-	
-	if( mMaterial->transp & TF_CLIP ) {
-		glDisable(GL_BLEND); 
-		glEnable ( GL_ALPHA_TEST );
-		glAlphaFunc(GL_GREATER, 0.5f);
-		return false;
-	}
-	return false;
-}
-
 void KX_BlenderMaterial::setTexMatrixData(int i)
 {
 	glMatrixMode(GL_TEXTURE);
@@ -831,12 +864,14 @@ KX_PYMETHODDEF_DOC( KX_BlenderMaterial, getShader , "getShader()")
 void KX_BlenderMaterial::SetBlenderGLSLShader(void)
 {
 	if(!mBlenderShader)
-		mBlenderShader = new BL_BlenderShader(mMaterial->material, m_lightlayer);
+		mBlenderShader = new BL_BlenderShader(mScene, mMaterial->material, m_lightlayer);
 
 	if(!mBlenderShader->Ok()) {
 		delete mBlenderShader;
 		mBlenderShader = 0;
 	}
+	else
+		m_flag |= RAS_BLENDERGLSL;
 }
 
 KX_PYMETHODDEF_DOC( KX_BlenderMaterial, getMaterialIndex, "getMaterialIndex()")
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h
index bf6d2095e7c..0d7657b8cdb 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.h
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h
@@ -90,11 +90,13 @@ public:
 	// --------------------------------
 	// pre calculate to avoid pops/lag at startup
 	virtual void OnConstruction( );
+
+	static void	EndFrame();
+
 private:
 	BL_Material*		mMaterial;
 	BL_Shader*			mShader;
 	BL_BlenderShader*	mBlenderShader;
-	static BL_BlenderShader *mLastBlenderShader;
 	KX_Scene*		mScene;
 	BL_Texture		mTextures[MAXTEX];		// texture array
 	bool			mUserDefBlend;
@@ -114,7 +116,6 @@ private:
 	void	setBlenderShaderData( bool enable, RAS_IRasterizer *ras);
 	void	setShaderData( bool enable, RAS_IRasterizer *ras);
 
-	bool	setDefaultBlending();
 	void	setObjectMatrixData(int i, RAS_IRasterizer *ras);
 	void	setTexMatrixData(int i);
 
@@ -123,6 +124,10 @@ private:
 	// cleanup stuff
 	void	OnExit();
 
+	// shader chacing
+	static BL_BlenderShader *mLastBlenderShader;
+	static BL_Shader		*mLastShader;
+
 	mutable int	mPass;
 };
 
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index 3d9c7aafd70..df478be5ca2 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -77,10 +77,10 @@ KX_GameObject::KX_GameObject(
 	SCA_IObject(T),
 	m_bDyna(false),
 	m_layer(0),
+	m_pBlenderObject(NULL),
 	m_bSuspendDynamics(false),
 	m_bUseObjectColor(false),
 	m_bIsNegativeScaling(false),
-	m_pBlenderObject(NULL),
 	m_bVisible(true),
 	m_pPhysicsController1(NULL),
 	m_pPhysicsEnvironment(NULL),
@@ -96,12 +96,9 @@ KX_GameObject::KX_GameObject(
 	KX_NormalParentRelation * parent_relation = 
 		KX_NormalParentRelation::New();
 	m_pSGNode->SetParentRelation(parent_relation);
-	
-
 };
 
 
-
 KX_GameObject::~KX_GameObject()
 {
 	// is this delete somewhere ?
@@ -165,6 +162,7 @@ STR_String KX_GameObject::GetName()
 void KX_GameObject::SetName(STR_String name)
 {
 	m_name = name;
+
 };								// Set the name of the value
 
 
@@ -454,12 +452,13 @@ KX_GameObject::UpdateMaterialData(
 	)
 {
 	int mesh = 0;
+
 	if (((unsigned int)mesh < m_meshes.size()) && mesh >= 0) {
 		RAS_MaterialBucket::Set::iterator mit = m_meshes[mesh]->GetFirstMaterial();
 		for(; mit != m_meshes[mesh]->GetLastMaterial(); ++mit)
 		{
 			RAS_IPolyMaterial* poly = (*mit)->GetPolyMaterial();
-			if(poly->GetFlag() & RAS_BLENDERMAT )
+			if(poly->GetFlag() & RAS_BLENDERMAT)
 			{
 				KX_BlenderMaterial *m =  static_cast<KX_BlenderMaterial*>(poly);
 				
@@ -467,7 +466,8 @@ KX_GameObject::UpdateMaterialData(
 				{
 					m->UpdateIPO(rgba, specrgb,hard,spec,ref,emit, alpha);
 					// if mesh has only one material attached to it then use original hack with no need to edit vertices (better performance)
-					SetObjectColor(rgba);
+					if(!(poly->GetFlag() & RAS_BLENDERGLSL))
+						SetObjectColor(rgba);
 				}
 				else
 				{
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index db099d56b55..1d6cc975ab5 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -118,7 +118,6 @@ KX_KetsjiEngine::KX_KetsjiEngine(KX_ISystem* system)
 	m_bInitialized(false),
 	m_activecam(0),
 	m_bFixedTime(false),
-	m_game2ipo(false),
 	
 	m_firstframe(true),
 	
@@ -148,6 +147,8 @@ KX_KetsjiEngine::KX_KetsjiEngine(KX_ISystem* system)
 	m_showBackground(false),
 	m_show_debug_properties(false),
 
+	m_game2ipo(false),
+
 	// Default behavior is to hide the cursor every frame.
 	m_hideCursor(false),
 
diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
index 93d6d5bb70d..144f74a1a4c 100644
--- a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
@@ -59,7 +59,8 @@ KX_PolygonMaterial::KX_PolygonMaterial(const STR_String &texname,
 											   int tilexrep,
 											   int tileyrep,
 											   int mode,
-											   bool transparant,
+											   int transp,
+											   bool alpha,
 											   bool zsort,
 											   int lightlayer,
 											   bool bIsTriangle,
@@ -74,7 +75,8 @@ KX_PolygonMaterial::KX_PolygonMaterial(const STR_String &texname,
 							tilexrep,
 							tileyrep,
 							mode,
-							transparant,
+							transp,
+							alpha,
 							zsort,
 							lightlayer,
 							bIsTriangle,
@@ -245,7 +247,7 @@ PyObject* KX_PolygonMaterial::_getattr(const STR_String& attr)
 	if (attr == "drawingmode")
 		return PyInt_FromLong(m_drawingmode);
 	if (attr == "transparent")
-		return PyInt_FromLong(m_transparant);
+		return PyInt_FromLong(m_alpha);
 	if (attr == "zsort")
 		return PyInt_FromLong(m_zsort);
 	if (attr == "lightlayer")
@@ -312,7 +314,7 @@ int KX_PolygonMaterial::_setattr(const STR_String &attr, PyObject *pyvalue)
 		
 		if (attr == "transparent")
 		{
-			m_transparant = value;
+			m_alpha = value;
 			return 0;
 		}
 		
diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.h b/source/gameengine/Ketsji/KX_PolygonMaterial.h
index 19015494e06..11c8baa8b1f 100644
--- a/source/gameengine/Ketsji/KX_PolygonMaterial.h
+++ b/source/gameengine/Ketsji/KX_PolygonMaterial.h
@@ -64,7 +64,8 @@ public:
 		int tilexrep,
 		int tileyrep,
 		int mode,
-		bool transparant,
+		int transp,
+		bool alpha,
 		bool zsort,
 		int lightlayer,
 		bool bIsTriangle,
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 648a6ca31d5..ad476e492d0 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -37,6 +37,7 @@
 #include "MT_assert.h"
 
 #include "KX_KetsjiEngine.h"
+#include "KX_BlenderMaterial.h"
 #include "RAS_IPolygonMaterial.h"
 #include "ListValue.h"
 #include "SCA_LogicManager.h"
@@ -116,13 +117,13 @@ KX_Scene::KX_Scene(class SCA_IInputDevice* keyboarddevice,
 	PyObjectPlus(&KX_Scene::Type),
 	m_keyboardmgr(NULL),
 	m_mousemgr(NULL),
+	m_sceneConverter(NULL),
 	m_physicsEnvironment(0),
 	m_sceneName(sceneName),
 	m_adi(adi),
 	m_networkDeviceInterface(ndi),
 	m_active_camera(NULL),
-	m_ueberExecutionPriority(0),
-	m_sceneConverter(NULL)
+	m_ueberExecutionPriority(0)
 {
 	m_suspendedtime = 0.0;
 	m_suspendeddelta = 0.0;
@@ -984,6 +985,7 @@ int KX_Scene::NewRemoveObject(class CValue* gameobj)
 		//m_active_camera->Release();
 		m_active_camera = NULL;
 	}
+
 	// in case this is a camera
 	m_cameras.remove((KX_Camera*)newobj);
 
@@ -1240,14 +1242,10 @@ void KX_Scene::MarkSubTreeVisible(SG_Tree *node, RAS_IRasterizer* rasty, bool vi
 			if (visible)
 			{
 				int nummeshes = gameobj->GetMeshCount();
-				MT_Transform t( cam->GetWorldToCamera() * gameobj->GetSGNode()->GetWorldTransform());
-	
 				
+				// this adds the vertices to the display list
 				for (int m=0;m<nummeshes;m++)
-				{
-					// this adds the vertices to the display list
-					(gameobj->GetMesh(m))->SchedulePolygons(t, rasty->GetDrawingMode());
-				}
+					(gameobj->GetMesh(m))->SchedulePolygons(rasty->GetDrawingMode());
 			}
 			gameobj->MarkVisible(visible);
 		}
@@ -1304,12 +1302,11 @@ void KX_Scene::MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj,KX_Cam
 	if (vis)
 	{
 		int nummeshes = gameobj->GetMeshCount();
-		MT_Transform t(cam->GetWorldToCamera() * gameobj->GetSGNode()->GetWorldTransform());
 		
 		for (int m=0;m<nummeshes;m++)
 		{
 			// this adds the vertices to the display list
-			(gameobj->GetMesh(m))->SchedulePolygons(t, rasty->GetDrawingMode());
+			(gameobj->GetMesh(m))->SchedulePolygons(rasty->GetDrawingMode());
 		}
 		// Visibility/ non-visibility are marked
 		// elsewhere now.
@@ -1422,7 +1419,7 @@ void KX_Scene::UpdateParents(double curtime)
 
 RAS_MaterialBucket* KX_Scene::FindBucket(class RAS_IPolyMaterial* polymat, bool &bucketCreated)
 {
-	return m_bucketmanager->RAS_BucketManagerFindBucket(polymat, bucketCreated);
+	return m_bucketmanager->FindBucket(polymat, bucketCreated);
 }
 
 
@@ -1432,10 +1429,9 @@ void KX_Scene::RenderBuckets(const MT_Transform & cameratransform,
 							 class RAS_IRenderTools* rendertools)
 {
 	m_bucketmanager->Renderbuckets(cameratransform,rasty,rendertools);
+	KX_BlenderMaterial::EndFrame();
 }
 
-
-
 void KX_Scene::UpdateObjectActivity(void) 
 {
 	if (m_activity_culling) {