Apricot Branch

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

svn merge -r15866:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender

Alpha blending and sorting changes, but also include some initial
support for GLSL lamps in dupligroups (only one duplicate works at
the moment).

24 files changed, 446 insertions, 757 deletions

diff --git a/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.cpp b/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.cpp
deleted file mode 100644
index d173b1c66d9..00000000000
--- a/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * $Id$
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include "KX_BlenderPolyMaterial.h"
-#include "BKE_mesh.h"
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#if 0
-KX_BlenderPolyMaterial::KX_BlenderPolyMaterial(const STR_String &texname,
-											   bool ba,
-											   const STR_String& matname,
-											   int tile,
-											   int tilexrep,
-											   int tileyrep,
-											   int mode,
-											   bool transparant,
-											   bool zsort,
-											   int lightlayer,
-											   bool bIsTriangle,
-											   void* clientobject,
-											   struct MTFace* tface)
-		: RAS_IPolyMaterial(texname,
-							false,
-							matname,
-							tile,
-							tilexrep,
-							tileyrep,
-							mode,
-							transparant,
-							zsort,
-							lightlayer,
-							bIsTriangle,
-							clientobject),
-		m_tface(tface)
-{
-}
-
-void KX_BlenderPolyMaterial::Activate(RAS_IRasterizer* rasty, TCachingInfo& cachingInfo) const 
-{
-
-	
-	if (GetCachingInfo() != cachingInfo)
-	{
-		if (!cachingInfo)
-		{
-			set_tpage(NULL);
-		}
-		cachingInfo = GetCachingInfo();
-
-		if ((m_drawingmode & 4)&& (rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED))
-		{
-			update_realtime_texture((struct MTFace*) m_tface, rasty->GetTime());
-			set_tpage(m_tface);
-			rasty->EnableTextures(true);
-		}
-		else
-		{
-			set_tpage(NULL);
-			rasty->EnableTextures(false);
-		}
-		
-		if(m_drawingmode & RAS_IRasterizer::KX_TWOSIDE)
-		{
-			rasty->SetCullFace(false);
-		}
-		else
-		{
-			rasty->SetCullFace(true);
-		}
-
-		if (m_drawingmode & RAS_IRasterizer::KX_LINES) {
-			rasty->SetLines(true);
-		}
-		else {
-			rasty->SetLines(false);
-		}
-	}
-
-	rasty->SetSpecularity(m_specular[0],m_specular[1],m_specular[2],m_specularity);
-	rasty->SetShinyness(m_shininess);
-	rasty->SetDiffuse(m_diffuse[0], m_diffuse[1],m_diffuse[2], 1.0);
-}
-
-
-#endif
-
-
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.h b/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.h
deleted file mode 100644
index 35823b2125b..00000000000
--- a/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-#ifndef __KX_BLENDERPOLYMATERIAL
-#define __KX_BLENDERPOLYMATERIAL
-
-#include "RAS_MaterialBucket.h"
-#include "RAS_IRasterizer.h"
-
-struct MTFace;
-extern "C" int set_tpage(MTFace* tface);		/* Worst hack ever */
-
-#if 0
-class KX_BlenderPolyMaterial : public RAS_IPolyMaterial
-{
-	/** Blender texture face structure. */
-	MTFace* m_tface;
-
-public:
-	
-	KX_BlenderPolyMaterial(const STR_String &texname,
-		bool ba,
-		const STR_String& matname,
-		int tile,
-		int tilexrep,
-		int tileyrep,
-		int mode,
-		bool transparant,
-		bool zsort,
-		int lightlayer,
-		bool bIsTriangle,
-		void* clientobject,
-		struct MTFace* tface);	
-	
-	/**
-	 * Returns the caching information for this material,
-	 * This can be used to speed up the rasterizing process.
-	 * @return The caching information.
-	 */
-	virtual TCachingInfo GetCachingInfo(void) const;
-
-	/**
-	 * Activates the material in the (OpenGL) rasterizer.
-	 * On entry, the cachingInfo contains info about the last activated material.
-	 * On exit, the cachingInfo should contain updated info about this material.
-	 * @param rasty			The rasterizer in which the material should be active.
-	 * @param cachingInfo	The information about the material used to speed up rasterizing.
-	 */
-	virtual void Activate(RAS_IRasterizer* rasty, TCachingInfo& cachingInfo) const;
-
-	/**
-	 * Returns the Blender texture face structure that is used for this material.
-	 * @return The material's texture face.
-	 */
-	MTFace* GetMTFace(void) const;
-protected:
-private:
-};
-
-
-inline MTFace* KX_BlenderPolyMaterial::GetMTFace(void) const
-{
-	return m_tface;
-}
-
-inline RAS_IPolyMaterial::TCachingInfo KX_BlenderPolyMaterial::GetCachingInfo(void) const
-{
-	return GetMTFace();
-}
-
-#endif
-
-#endif // __KX_BLENDERPOLYMATERIAL
-
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
index a2bc6d8fb02..6a8d83efe40 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
@@ -40,7 +40,6 @@
 // it needs the gameobject and the sumo physics scene for a raycast
 #include "KX_GameObject.h"
 
-#include "KX_BlenderPolyMaterial.h"
 #include "KX_PolygonMaterial.h"
 #include "KX_BlenderMaterial.h"
 
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 1809e41b91c..fce41ba8bd1 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -326,7 +326,7 @@ BL_Material* ConvertMaterial(
 	//this needs some type of manager
 	BL_Material *material = new BL_Material();
 
-	int numchan =	-1;
+	int numchan =	-1, texalpha = 0;
 	bool validmat	= (mat!=0);
 	bool validface	= (tface!=0);
 	
@@ -371,12 +371,13 @@ BL_Material* ConvertMaterial(
 
 			if(i==0 && facetex ) {
 				Image*tmp = (Image*)(tface->tpage);
+
 				if(tmp) {
 					material->img[i] = tmp;
 					material->texname[i] = material->img[i]->id.name;
 					material->flag[i] |= ( tface->transp  &TF_ALPHA	)?USEALPHA:0;
 					material->flag[i] |= ( tface->transp  &TF_ADD	)?CALCALPHA:0;
-					material->ras_mode|= ( tface->transp  &(TF_ADD | TF_ALPHA))?TRANSP:0;
+
 					if(material->img[i]->flag & IMA_REFLECT)
 						material->mapping[i].mapping |= USEREFL;
 					else
@@ -434,6 +435,8 @@ BL_Material* ConvertMaterial(
 							material->flag[i] |= ( mttmp->mapto  & MAP_ALPHA		)?TEXALPHA:0;
 							material->flag[i] |= ( mttmp->texflag& MTEX_NEGATIVE	)?TEXNEG:0;
 
+							if(!glslmat && (material->flag[i] & TEXALPHA))
+								texalpha = 1;
 						}
 					}
 					else if(mttmp->tex->type == TEX_ENVMAP) {
@@ -550,17 +553,7 @@ BL_Material* ConvertMaterial(
 		material->ref			= mat->ref;
 		material->amb			= mat->amb;
 
-		// set alpha testing without z-sorting
-		if( ( validface && (!(tface->transp &~ TF_CLIP))) && mat->mode & MA_ZTRA) {
-			// sets the RAS_IPolyMaterial::m_flag |RAS_FORCEALPHA
-			// this is so we don't have the overhead of the z-sorting code
-			material->ras_mode|=ALPHA_TEST;
-		}
-		else{
-			// use regular z-sorting
-			material->ras_mode |= ((mat->mode & MA_ZTRA) != 0)?ZSORT:0;
-		}
-		material->ras_mode |= ((mat->mode & MA_WIRE) != 0)?WIRE:0;
+		material->ras_mode |= (mat->mode & MA_WIRE)? WIRE: 0;
 	}
 	else {
 		int valid = 0;
@@ -578,7 +571,6 @@ BL_Material* ConvertMaterial(
 				material->mapping[0].mapping |= ( (material->img[0]->flag & IMA_REFLECT)!=0 )?USEREFL:0;
 				material->flag[0] |= ( tface->transp  &TF_ALPHA	)?USEALPHA:0;
 				material->flag[0] |= ( tface->transp  &TF_ADD	)?CALCALPHA:0;
-				material->ras_mode|= ( tface->transp  & (TF_ADD|TF_ALPHA))?TRANSP:0;
 				valid++;
 			}
 		}
@@ -611,10 +603,6 @@ BL_Material* ConvertMaterial(
 
 		material->ras_mode |= ( (tface->mode & TF_DYNAMIC)!= 0 )?COLLIDER:0;
 		material->transp = tface->transp;
-		
-		if(tface->transp&~TF_CLIP)
-			material->ras_mode |= TRANSP;
-
 		material->tile	= tface->tile;
 		material->mode	= tface->mode;
 			
@@ -635,7 +623,15 @@ BL_Material* ConvertMaterial(
 		material->tile		= 0;
 	}
 
+	// with ztransp enabled, enforce alpha blending mode
+	if(validmat && (mat->mode & MA_ZTRA) && (material->transp == TF_SOLID))
+		material->transp = TF_ALPHA;
 
+	// always zsort alpha + add
+	if(material->transp == TF_ALPHA || material->transp == TF_ADD || texalpha) {
+		material->ras_mode |= ALPHA;
+		material->ras_mode |= (material->mode & TF_ALPHASORT)? ZSORT: 0;
+	}
 
 	// get uv sets
 	if(validmat) 
@@ -774,273 +770,261 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 
 	for (int f=0;f<totface;f++,mface++)
 	{
+		Material* ma = 0;
 		bool collider = true;
-		
-		// only add valid polygons
-		if (mface->v3)
-		{
-			MT_Point2 uv0(0.0,0.0),uv1(0.0,0.0),uv2(0.0,0.0),uv3(0.0,0.0);
-			MT_Point2 uv20(0.0,0.0),uv21(0.0,0.0),uv22(0.0,0.0),uv23(0.0,0.0);
-			// rgb3 is set from the adjoint face in a square
-			unsigned int rgb0,rgb1,rgb2,rgb3 = 0;
-
-			MT_Vector3 no0, no1, no2, no3;
-			MT_Point3 pt0, pt1, pt2, pt3;
-			MT_Vector4 tan0, tan1, tan2, tan3;
-
-			pt0 = MT_Point3(mvert[mface->v1].co);
-			pt1 = MT_Point3(mvert[mface->v2].co);
-			pt2 = MT_Point3(mvert[mface->v3].co);
-			pt3 = (mface->v4)? MT_Point3(mvert[mface->v4].co): MT_Point3(0.0, 0.0, 0.0);
-	
-			if(mface->flag & ME_SMOOTH) {
-				float n0[3], n1[3], n2[3], n3[3];
-
-				NormalShortToFloat(n0, mvert[mface->v1].no);
-				NormalShortToFloat(n1, mvert[mface->v2].no);
-				NormalShortToFloat(n2, mvert[mface->v3].no);
-				no0 = n0;
-				no1 = n1;
-				no2 = n2;
-
-				if(mface->v4) {
-					NormalShortToFloat(n3, mvert[mface->v4].no);
-					no3 = n3;
-				}
-				else
-					no3 = MT_Vector3(0.0, 0.0, 0.0);
+		MT_Point2 uv0(0.0,0.0),uv1(0.0,0.0),uv2(0.0,0.0),uv3(0.0,0.0);
+		MT_Point2 uv20(0.0,0.0),uv21(0.0,0.0),uv22(0.0,0.0),uv23(0.0,0.0);
+		unsigned int rgb0,rgb1,rgb2,rgb3 = 0;
+
+		MT_Vector3 no0, no1, no2, no3;
+		MT_Point3 pt0, pt1, pt2, pt3;
+		MT_Vector4 tan0, tan1, tan2, tan3;
+
+		/* get coordinates, normals and tangents */
+		pt0 = MT_Point3(mvert[mface->v1].co);
+		pt1 = MT_Point3(mvert[mface->v2].co);
+		pt2 = MT_Point3(mvert[mface->v3].co);
+		pt3 = (mface->v4)? MT_Point3(mvert[mface->v4].co): MT_Point3(0.0, 0.0, 0.0);
+
+		if(mface->flag & ME_SMOOTH) {
+			float n0[3], n1[3], n2[3], n3[3];
+
+			NormalShortToFloat(n0, mvert[mface->v1].no);
+			NormalShortToFloat(n1, mvert[mface->v2].no);
+			NormalShortToFloat(n2, mvert[mface->v3].no);
+			no0 = n0;
+			no1 = n1;
+			no2 = n2;
+
+			if(mface->v4) {
+				NormalShortToFloat(n3, mvert[mface->v4].no);
+				no3 = n3;
 			}
-			else {
-				float fno[3];
+			else
+				no3 = MT_Vector3(0.0, 0.0, 0.0);
+		}
+		else {
+			float fno[3];
 
-				if(mface->v4)
-					CalcNormFloat4(mvert[mface->v1].co, mvert[mface->v2].co,
-						mvert[mface->v3].co, mvert[mface->v4].co, fno);
-				else
-					CalcNormFloat(mvert[mface->v1].co, mvert[mface->v2].co,
-						mvert[mface->v3].co, fno);
+			if(mface->v4)
+				CalcNormFloat4(mvert[mface->v1].co, mvert[mface->v2].co,
+					mvert[mface->v3].co, mvert[mface->v4].co, fno);
+			else
+				CalcNormFloat(mvert[mface->v1].co, mvert[mface->v2].co,
+					mvert[mface->v3].co, fno);
 
-				no0 = no1 = no2 = no3 = MT_Vector3(fno);
-			}
+			no0 = no1 = no2 = no3 = MT_Vector3(fno);
+		}
+
+		if(tangent) {
+			tan0 = tangent[f*4 + 0];
+			tan1 = tangent[f*4 + 1];
+			tan2 = tangent[f*4 + 2];
+
+			if (mface->v4)
+				tan3 = tangent[f*4 + 3];
+		}
+
+		/* get material */
+		ma = give_current_material(blenderobj, mface->mat_nr+1);
+	
+		{
+			bool polyvisible = true;
+			RAS_IPolyMaterial* polymat = NULL;
+			BL_Material *bl_mat = NULL;
+
+			if(converter->GetMaterials()) {
+				/* do Blender Multitexture and Blender GLSL materials */
+				unsigned int rgb[4];
+				MT_Point2 uv[4];
 
+				/* first is the BL_Material */
+				bl_mat = ConvertMaterial(ma, tface, tfaceName, mface, mcol,
+					lightlayer, blenderobj, layers, converter->GetGLSLMaterials());
+
+				bl_mat->material_index =  (int)mface->mat_nr;
+
+				polyvisible = ((bl_mat->ras_mode & POLY_VIS)!=0);
+				collider = ((bl_mat->ras_mode & COLLIDER)!=0);
+
+				/* vertex colors and uv's were stored in bl_mat temporarily */
+				bl_mat->GetConversionRGB(rgb);
+				rgb0 = rgb[0]; rgb1 = rgb[1];
+				rgb2 = rgb[2]; rgb3 = rgb[3];
+
+				bl_mat->GetConversionUV(uv);
+				uv0 = uv[0]; uv1 = uv[1];
+				uv2 = uv[2]; uv3 = uv[3];
+
+				bl_mat->GetConversionUV2(uv);
+				uv20 = uv[0]; uv21 = uv[1];
+				uv22 = uv[2]; uv23 = uv[3];
+				
+				/* then the KX_BlenderMaterial */
+				polymat = new KX_BlenderMaterial(scene, bl_mat, skinMesh, lightlayer, blenderobj );
+			}
+			else {
+				/* do Texture Face materials */
+				Image* bima = (tface)? (Image*)tface->tpage: NULL;
+				STR_String imastr =  (tface)? (bima? (bima)->id.name : "" ) : "";
 		
-			{
-				Material* ma = 0;
-				bool polyvisible = true;
-				RAS_IPolyMaterial* polymat = NULL;
-				BL_Material *bl_mat = NULL;
-
-				if(converter->GetMaterials()) 
-				{	
-					if(mesh->totcol > 1)
-						ma = mesh->mat[mface->mat_nr];
-					else 
-						ma = give_current_material(blenderobj, 1);
-
-					bl_mat = ConvertMaterial(ma, tface, tfaceName, mface, mcol, lightlayer, blenderobj, layers, converter->GetGLSLMaterials());
-					// set the index were dealing with
-					bl_mat->material_index =  (int)mface->mat_nr;
-
-					polyvisible = ((bl_mat->ras_mode & POLY_VIS)!=0);
-					collider = ((bl_mat->ras_mode & COLLIDER)!=0);
+				char transp=0;
+				short mode=0, tile=0;
+				int	tilexrep=4,tileyrep = 4;
+				
+				if (bima) {
+					tilexrep = bima->xrep;
+					tileyrep = bima->yrep;
+				}
+
+				/* get tface properties if available */
+				if(tface) {
+					/* TF_DYNAMIC means the polygon is a collision face */
+					collider = ((tface->mode & TF_DYNAMIC) != 0);
+					transp = tface->transp;
+					tile = tface->tile;
+					mode = tface->mode;
 					
-					polymat = new KX_BlenderMaterial(scene, bl_mat, skinMesh, lightlayer, blenderobj );
+					polyvisible = !((mface->flag & ME_HIDE)||(tface->mode & TF_INVISIBLE));
 					
-					unsigned int rgb[4];
-					bl_mat->GetConversionRGB(rgb);
-					rgb0 = rgb[0]; rgb1 = rgb[1];
-					rgb2 = rgb[2]; rgb3 = rgb[3];
-					MT_Point2 uv[4];
-					bl_mat->GetConversionUV(uv);
-					uv0 = uv[0]; uv1 = uv[1];
-					uv2 = uv[2]; uv3 = uv[3];
-
-					bl_mat->GetConversionUV2(uv);
-					uv20 = uv[0]; uv21 = uv[1];
-					uv22 = uv[2]; uv23 = uv[3];
-
-					if(tangent){
-						tan0 = tangent[f*4 + 0];
-						tan1 = tangent[f*4 + 1];
-						tan2 = tangent[f*4 + 2];
-
-						if (mface->v4)
-							tan3 = tangent[f*4 + 3];
-					}
+					uv0 = MT_Point2(tface->uv[0]);
+					uv1 = MT_Point2(tface->uv[1]);
+					uv2 = MT_Point2(tface->uv[2]);
+	
+					if (mface->v4)
+						uv3 = MT_Point2(tface->uv[3]);
+				} 
+				else {
+					/* no texfaces, set COLLSION true and everything else FALSE */
+					mode = default_face_mode;	
+					transp = TF_SOLID;
+					tile = 0;
 				}
-				else
-				{
-					ma = give_current_material(blenderobj, 1);
 
-					Image* bima = (tface)? (Image*)tface->tpage: NULL;
-		
-					STR_String imastr = 
-						(tface)? (bima? (bima)->id.name : "" ) : "";
-			
-					char transp=0, transparent=0;
-					short mode=0, tile=0;
-					int	tilexrep=4,tileyrep = 4;
+				/* get vertex colors */
+				if (mcol) {
+					/* we have vertex colors */
+					rgb0 = KX_Mcol2uint_new(mcol[0]);
+					rgb1 = KX_Mcol2uint_new(mcol[1]);
+					rgb2 = KX_Mcol2uint_new(mcol[2]);
 					
-					if (bima)
-					{
-						tilexrep = bima->xrep;
-						tileyrep = bima->yrep;
-				
-					}
+					if (mface->v4)
+						rgb3 = KX_Mcol2uint_new(mcol[3]);
+				}
+				else {
+					/* no vertex colors, take from material, otherwise white */
+					unsigned int color = 0xFFFFFFFFL;
 
-					if(tface)
+					if (ma)
 					{
-						// Use texface colors if available
-						//TF_DYNAMIC means the polygon is a collision face
-						collider = ((tface->mode & TF_DYNAMIC) != 0);
-						transp = tface->transp;
-						transparent = ELEM(transp, TF_ALPHA, TF_ADD);
-						tile = tface->tile;
-						mode = tface->mode;
+						union
+						{
+							unsigned char cp[4];
+							unsigned int integer;
+						} col_converter;
 						
-						polyvisible = !((mface->flag & ME_HIDE)||(tface->mode & TF_INVISIBLE));
+						col_converter.cp[3] = (unsigned char) (ma->r*255.0);
+						col_converter.cp[2] = (unsigned char) (ma->g*255.0);
+						col_converter.cp[1] = (unsigned char) (ma->b*255.0);
+						col_converter.cp[0] = (unsigned char) (ma->alpha*255.0);
 						
-						uv0 = MT_Point2(tface->uv[0]);
-						uv1 = MT_Point2(tface->uv[1]);
-						uv2 = MT_Point2(tface->uv[2]);
-		
-						if (mface->v4)
-							uv3 = MT_Point2(tface->uv[3]);
-					} 
-					else
-					{
-						// no texfaces, set COLLSION true and everything else FALSE
-						
-						mode = default_face_mode;	
-						transp = TF_SOLID;
-						transparent = 0;
-						tile = 0;
+						color = col_converter.integer;
 					}
 
-					if (mcol)
-					{
-						// Use vertex colors
-						rgb0 = KX_Mcol2uint_new(mcol[0]);
-						rgb1 = KX_Mcol2uint_new(mcol[1]);
-						rgb2 = KX_Mcol2uint_new(mcol[2]);
-						
-						if (mface->v4)
-							rgb3 = KX_Mcol2uint_new(mcol[3]);
-					}
-					else {
-						// no vertex colors: take from material if we have one,
-						// otherwise set to white
-						unsigned int color = 0xFFFFFFFFL;
+					rgb0 = KX_rgbaint2uint_new(color);
+					rgb1 = KX_rgbaint2uint_new(color);
+					rgb2 = KX_rgbaint2uint_new(color);	
+					
+					if (mface->v4)
+						rgb3 = KX_rgbaint2uint_new(color);
+				}
+				
+				bool istriangle = (mface->v4==0);
 
-						if (ma)
-						{
-							union
-							{
-								unsigned char cp[4];
-								unsigned int integer;
-							} col_converter;
-							
-							col_converter.cp[3] = (unsigned char) (ma->r*255.0);
-							col_converter.cp[2] = (unsigned char) (ma->g*255.0);
-							col_converter.cp[1] = (unsigned char) (ma->b*255.0);
-							col_converter.cp[0] = (unsigned char) (ma->alpha*255.0);
-							
-							color = col_converter.integer;
-						}
+				// only zsort alpha + add
+				bool alpha = (transp == TF_ALPHA || transp == TF_ADD);
+				bool zsort = (mode & TF_ALPHASORT)? alpha: 0;
+
+				polymat = new KX_PolygonMaterial(imastr, ma,
+					tile, tilexrep, tileyrep, 
+					mode, transp, alpha, zsort, lightlayer, istriangle, blenderobj, tface, (unsigned int*)mcol);
 	
-						rgb0 = KX_rgbaint2uint_new(color);
-						rgb1 = KX_rgbaint2uint_new(color);
-						rgb2 = KX_rgbaint2uint_new(color);	
-						
-						if (mface->v4)
-							rgb3 = KX_rgbaint2uint_new(color);
-					}
-					
-					bool istriangle = (mface->v4==0);
-					bool zsort = ma?(ma->mode & MA_ZTRA) != 0:false;
-					
-					polymat = new KX_PolygonMaterial(imastr, ma,
-						tile, tilexrep, tileyrep, 
-						mode, transp, transparent, zsort, lightlayer, istriangle, blenderobj, tface, (unsigned int*)mcol);
-		
-					if (ma)
-					{
-						polymat->m_specular = MT_Vector3(ma->specr, ma->specg, ma->specb)*ma->spec;
-						polymat->m_shininess = (float)ma->har/4.0; // 0 < ma->har <= 512
-						polymat->m_diffuse = MT_Vector3(ma->r, ma->g, ma->b)*(ma->emit + ma->ref);
+				if (ma) {
+					polymat->m_specular = MT_Vector3(ma->specr, ma->specg, ma->specb)*ma->spec;
+					polymat->m_shininess = (float)ma->har/4.0; // 0 < ma->har <= 512
+					polymat->m_diffuse = MT_Vector3(ma->r, ma->g, ma->b)*(ma->emit + ma->ref);
+				}
+				else {
+					polymat->m_specular = MT_Vector3(0.0f,0.0f,0.0f);
+					polymat->m_shininess = 35.0;
+				}
+			}
 
-					} else
-					{
-						polymat->m_specular = MT_Vector3(0.0f,0.0f,0.0f);
-						polymat->m_shininess = 35.0;
-					}
+			// see if a bucket was reused or a new one was created
+			// this way only one KX_BlenderMaterial object has to exist per bucket
+			bool bucketCreated; 
+			RAS_MaterialBucket* bucket = scene->FindBucket(polymat, bucketCreated);
+			if (bucketCreated) {
+				// this is needed to free up memory afterwards
+				converter->RegisterPolyMaterial(polymat);
+				if(converter->GetMaterials()) {
+					converter->RegisterBlenderMaterial(bl_mat);
 				}
-	
-				// see if a bucket was reused or a new one was created
-				// this way only one KX_BlenderMaterial object has to exist per bucket
-				bool bucketCreated; 
-				RAS_MaterialBucket* bucket = scene->FindBucket(polymat, bucketCreated);
-				if (bucketCreated) {
-					// this is needed to free up memory afterwards
-					converter->RegisterPolyMaterial(polymat);
-					if(converter->GetMaterials()) {
-						converter->RegisterBlenderMaterial(bl_mat);
-					}
-				} else {
-					// delete the material objects since they are no longer needed
-					// from now on, use the polygon material from the material bucket
-					delete polymat;
-					if(converter->GetMaterials()) {
-						delete bl_mat;
-					}
-					polymat = bucket->GetPolyMaterial();
+			} else {
+				// delete the material objects since they are no longer needed
+				// from now on, use the polygon material from the material bucket
+				delete polymat;
+				if(converter->GetMaterials()) {
+					delete bl_mat;
 				}
-							 
-				int nverts = mface->v4?4:3;
-				int vtxarray = meshobj->FindVertexArray(nverts,polymat);
-				RAS_Polygon* poly = new RAS_Polygon(bucket,polyvisible,nverts,vtxarray);
+				polymat = bucket->GetPolyMaterial();
+			}
+						 
+			int nverts = mface->v4?4:3;
+			int vtxarray = meshobj->FindVertexArray(nverts,polymat);
+			RAS_Polygon* poly = new RAS_Polygon(bucket,polyvisible,nverts,vtxarray);
 
-				bool flat;
+			bool flat;
 
-				if (skinMesh) {
-					/* If the face is set to solid, all fnors are the same */
-					if (mface->flag & ME_SMOOTH)
-						flat = false;
-					else
-						flat = true;
-				}
-				else
+			if (skinMesh) {
+				/* If the face is set to solid, all fnors are the same */
+				if (mface->flag & ME_SMOOTH)
 					flat = false;
+				else
+					flat = true;
+			}
+			else
+				flat = false;
 
-				poly->SetVertex(0,meshobj->FindOrAddVertex(vtxarray,pt0,uv0,uv20,tan0,rgb0,no0,flat,polymat,mface->v1));
-				poly->SetVertex(1,meshobj->FindOrAddVertex(vtxarray,pt1,uv1,uv21,tan1,rgb1,no1,flat,polymat,mface->v2));
-				poly->SetVertex(2,meshobj->FindOrAddVertex(vtxarray,pt2,uv2,uv22,tan2,rgb2,no2,flat,polymat,mface->v3));
-				if (nverts==4)
-					poly->SetVertex(3,meshobj->FindOrAddVertex(vtxarray,pt3,uv3,uv23,tan3,rgb3,no3,flat,polymat,mface->v4));
+			poly->SetVertex(0,meshobj->FindOrAddVertex(vtxarray,pt0,uv0,uv20,tan0,rgb0,no0,flat,polymat,mface->v1));
+			poly->SetVertex(1,meshobj->FindOrAddVertex(vtxarray,pt1,uv1,uv21,tan1,rgb1,no1,flat,polymat,mface->v2));
+			poly->SetVertex(2,meshobj->FindOrAddVertex(vtxarray,pt2,uv2,uv22,tan2,rgb2,no2,flat,polymat,mface->v3));
+			if (nverts==4)
+				poly->SetVertex(3,meshobj->FindOrAddVertex(vtxarray,pt3,uv3,uv23,tan3,rgb3,no3,flat,polymat,mface->v4));
 
-				meshobj->AddPolygon(poly);
-				if (poly->IsCollider())
+			meshobj->AddPolygon(poly);
+			if (poly->IsCollider())
+			{
+				RAS_TriangleIndex idx;
+				idx.m_index[0] = mface->v1;
+				idx.m_index[1] = mface->v2;
+				idx.m_index[2] = mface->v3;
+				idx.m_collider = collider;
+				meshobj->m_triangle_indices.push_back(idx);
+				if (nverts==4)
 				{
-					RAS_TriangleIndex idx;
-					idx.m_index[0] = mface->v1;
-					idx.m_index[1] = mface->v2;
-					idx.m_index[2] = mface->v3;
-					idx.m_collider = collider;
-					meshobj->m_triangle_indices.push_back(idx);
-					if (nverts==4)
-					{
-					idx.m_index[0] = mface->v1;
-					idx.m_index[1] = mface->v3;
-					idx.m_index[2] = mface->v4;
-					idx.m_collider = collider;
-					meshobj->m_triangle_indices.push_back(idx);
-					}
+				idx.m_index[0] = mface->v1;
+				idx.m_index[1] = mface->v3;
+				idx.m_index[2] = mface->v4;
+				idx.m_collider = collider;
+				meshobj->m_triangle_indices.push_back(idx);
 				}
-				
-//				poly->SetVisibleWireframeEdges(mface->edcode);
-				poly->SetCollider(collider);
 			}
+			
+//				poly->SetVisibleWireframeEdges(mface->edcode);
+			poly->SetCollider(collider);
 		}
+
 		if (tface) 
 			tface++;
 		if (mcol)
@@ -1751,6 +1735,7 @@ KX_GameObject* getGameOb(STR_String busc,CListValue* sumolist){
 	return 0;
 
 }
+
 // convert blender objects into ketsji gameobjects
 void BL_ConvertBlenderObjects(struct Main* maggie,
 							  const STR_String& scenename,
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.cpp b/source/gameengine/Ketsji/BL_BlenderShader.cpp
index f29408fbc6b..8b0bbc645a9 100644
--- a/source/gameengine/Ketsji/BL_BlenderShader.cpp
+++ b/source/gameengine/Ketsji/BL_BlenderShader.cpp
@@ -160,7 +160,7 @@ void BL_BlenderShader::Update( const KX_MeshSlot & ms, RAS_IRasterizer* rasty )
 
 	if(!mGPUMat) // || !mBound)
 		return;
-	
+
 	MT_Matrix4x4 model;
 	model.setValue(ms.m_OpenGLMatrix);
 	MT_Matrix4x4 view;
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 204e7b2ce8d..f0ef84032f7 100644
--- a/source/gameengine/Ketsji/BL_Texture.cpp
+++ b/source/gameengine/Ketsji/BL_Texture.cpp
@@ -384,9 +384,6 @@ void BL_Texture::DisableUnit()
 
 void BL_Texture::DisableAllTextures()
 {
-	glDisable(GL_BLEND);
-	glDisable(GL_ALPHA_TEST);
-
 	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 04ecc9d3230..e3e47bc511f 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
@@ -38,7 +38,6 @@
 
 BL_Shader *KX_BlenderMaterial::mLastShader = NULL;
 BL_BlenderShader *KX_BlenderMaterial::mLastBlenderShader = NULL;
-int KX_BlenderMaterial::mLastBlenderShaderBlend = -1;
 
 //static PyObject *gTextureDict = 0;
 
@@ -59,7 +58,7 @@ KX_BlenderMaterial::KX_BlenderMaterial(
 		data->tileyrep[0],
 		data->mode,
 		data->transp,
-		((data->ras_mode &TRANSP)!=0),
+		((data->ras_mode &ALPHA)!=0),
 		((data->ras_mode &ZSORT)!=0),
 		lightlayer,
 		((data->ras_mode &TRIANGLE)!=0),
@@ -80,7 +79,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;
@@ -164,11 +162,6 @@ void KX_BlenderMaterial::EndFrame()
 	if(mLastBlenderShader) {
 		mLastBlenderShader->SetProg(false);
 		mLastBlenderShader = NULL;
-
-		if(mLastBlenderShaderBlend != TF_SOLID) {
-			setBlendingMode(TF_SOLID);
-			mLastBlenderShaderBlend = TF_SOLID;
-		}
 	}
 
 	if(mLastShader) {
@@ -195,11 +188,6 @@ void KX_BlenderMaterial::OnExit()
 		if(mBlenderShader == mLastBlenderShader) {
 			mBlenderShader->SetProg(false);
 			mLastBlenderShader = NULL;
-
-			if(mLastBlenderShaderBlend != TF_SOLID) {
-				setBlendingMode(TF_SOLID);
-				mLastBlenderShaderBlend = TF_SOLID;
-			}
 		}
 
 		delete mBlenderShader;
@@ -229,6 +217,8 @@ void KX_BlenderMaterial::setShaderData( bool enable, RAS_IRasterizer *ras)
 			mShader->SetProg(false);
 			mLastShader = NULL;
 		}
+
+		ras->SetBlendingMode(TF_SOLID);
 		BL_Texture::DisableAllTextures();
 		return;
 	}
@@ -249,9 +239,12 @@ void KX_BlenderMaterial::setShaderData( bool enable, RAS_IRasterizer *ras)
 	}
 
 	if(!mUserDefBlend) {
-		setBlendingMode(mMaterial->transp);
+		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]);
@@ -265,43 +258,38 @@ void KX_BlenderMaterial::setBlenderShaderData( bool enable, RAS_IRasterizer *ras
 		if(mLastBlenderShader) {
 			mLastBlenderShader->SetProg(false);
 			mLastBlenderShader= NULL;
-
-			if(mLastBlenderShaderBlend != TF_SOLID) {
-				setBlendingMode(TF_SOLID);
-				mLastBlenderShaderBlend = TF_SOLID;
-			}
 		}
 
+		ras->SetBlendingMode(TF_SOLID);
 		BL_Texture::DisableAllTextures();
 		return;
 	}
 
 	if(!mBlenderShader->Equals(mLastBlenderShader)) {
+		ras->SetBlendingMode(mMaterial->transp);
 		BL_Texture::DisableAllTextures();
 
-		setBlendingMode(mMaterial->transp);
-		mLastBlenderShaderBlend = mMaterial->transp;
-
 		if(mLastBlenderShader)
 			mLastBlenderShader->SetProg(false);
 
 		mBlenderShader->SetProg(true);
 		mLastBlenderShader= mBlenderShader;
 	}
-
-	// do setBlendingMode with Update() for per object blend modes
 }
 
 void KX_BlenderMaterial::setTexData( bool enable, RAS_IRasterizer *ras)
 {
 	BL_Texture::DisableAllTextures();
-	if( !enable )
+
+	if( !enable ) {
+		ras->SetBlendingMode(TF_SOLID);
 		return;
+	}
 
 	BL_Texture::ActivateFirst();
 
 	if( mMaterial->IdMode == DEFAULT_BLENDER ) {
-		setBlendingMode(mMaterial->transp);
+		ras->SetBlendingMode(mMaterial->transp);
 		return;
 	}
 
@@ -311,7 +299,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);
-			setBlendingMode(mMaterial->transp);
+			ras->SetBlendingMode(mMaterial->transp);
 		}
 		return;
 	}
@@ -334,9 +322,12 @@ void KX_BlenderMaterial::setTexData( bool enable, RAS_IRasterizer *ras)
 	}
 
 	if(!mUserDefBlend) {
-		setBlendingMode(mMaterial->transp);
+		ras->SetBlendingMode(mMaterial->transp);
 	}
 	else {
+		ras->SetBlendingMode(TF_SOLID);
+		ras->SetBlendingMode(-1); // indicates custom mode
+
 		glEnable(GL_BLEND);
 		glBlendFunc(mBlendFunc[0], mBlendFunc[1]);
 	}
@@ -356,11 +347,6 @@ KX_BlenderMaterial::ActivatShaders(
 	if(mLastBlenderShader) {
 		mLastBlenderShader->SetProg(false);
 		mLastBlenderShader= NULL;
-
-		if(mLastBlenderShaderBlend != TF_SOLID) {
-			setBlendingMode(TF_SOLID);
-			mLastBlenderShaderBlend = TF_SOLID;
-		}
 	}
 
 	if (GetCachingInfo() != cachingInfo) {
@@ -460,11 +446,6 @@ KX_BlenderMaterial::ActivateMat(
 	if(mLastBlenderShader) {
 		mLastBlenderShader->SetProg(false);
 		mLastBlenderShader= NULL;
-
-		if(mLastBlenderShaderBlend != TF_SOLID) {
-			setBlendingMode(TF_SOLID);
-			mLastBlenderShaderBlend = TF_SOLID;
-		}
 	}
 
 	if (GetCachingInfo() != cachingInfo) {
@@ -576,10 +557,7 @@ void KX_BlenderMaterial::ActivateMeshSlot(const KX_MeshSlot & ms, RAS_IRasterize
 		if((blendmode == TF_SOLID || blendmode == TF_ALPHA) && mMaterial->transp != TF_SOLID)
 			blendmode = mMaterial->transp;
 
-		if(mLastBlenderShaderBlend != blendmode) {
-			setBlendingMode(blendmode);
-			mLastBlenderShaderBlend = blendmode;
-		}
+		rasty->SetBlendingMode(blendmode);
 	}
 }
 
@@ -660,30 +638,6 @@ void KX_BlenderMaterial::ActivateTexGen(RAS_IRasterizer *ras) const
 		ras->EnableTextures(false);
 }
 
-void KX_BlenderMaterial::setBlendingMode(int transp)
-{
-	if(transp == TF_SOLID) {
-		glDisable(GL_BLEND);
-		glDisable(GL_ALPHA_TEST);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	}
-	else if(transp == TF_ADD) {
-		glBlendFunc(GL_ONE, GL_ONE);
-		glEnable(GL_BLEND);
-		glDisable(GL_ALPHA_TEST);
-	}
-	else if(transp == TF_ALPHA) {
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		glEnable(GL_BLEND);
-		glDisable(GL_ALPHA_TEST);
-	}
-	else if(transp == TF_CLIP) {
-		glDisable(GL_BLEND); 
-		glEnable(GL_ALPHA_TEST);
-		glAlphaFunc(GL_GREATER, 0.5f);
-	}
-}
-
 void KX_BlenderMaterial::setTexMatrixData(int i)
 {
 	glMatrixMode(GL_TEXTURE);
@@ -914,6 +868,8 @@ void KX_BlenderMaterial::SetBlenderGLSLShader(void)
 		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 5bbf81d225c..0d7657b8cdb 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.h
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h
@@ -121,14 +121,11 @@ private:
 
 	void	setLightData();
 
-	static void	setBlendingMode(int transp);
-
 	// cleanup stuff
 	void	OnExit();
 
 	// shader chacing
 	static BL_BlenderShader *mLastBlenderShader;
-	static int				mLastBlenderShaderBlend;
 	static BL_Shader		*mLastShader;
 
 	mutable int	mPass;
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index 2baf3eaa43d..009592aa66a 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -119,7 +119,6 @@ KX_KetsjiEngine::KX_KetsjiEngine(KX_ISystem* system)
 	m_bInitialized(false),
 	m_activecam(0),
 	m_bFixedTime(false),
-	m_game2ipo(false),
 	
 	m_firstframe(true),
 	
@@ -149,6 +148,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 4cdca477740..d0d7c17148a 100644
--- a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
@@ -58,7 +58,7 @@ KX_PolygonMaterial::KX_PolygonMaterial(const STR_String &texname,
 											   int tileyrep,
 											   int mode,
 											   int transp,
-											   bool transparant,
+											   bool alpha,
 											   bool zsort,
 											   int lightlayer,
 											   bool bIsTriangle,
@@ -74,7 +74,7 @@ KX_PolygonMaterial::KX_PolygonMaterial(const STR_String &texname,
 							tileyrep,
 							mode,
 							transp,
-							transparant,
+							alpha,
 							zsort,
 							lightlayer,
 							bIsTriangle,
@@ -245,7 +245,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 +312,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 342856fc1a1..11c8baa8b1f 100644
--- a/source/gameengine/Ketsji/KX_PolygonMaterial.h
+++ b/source/gameengine/Ketsji/KX_PolygonMaterial.h
@@ -65,7 +65,7 @@ public:
 		int tileyrep,
 		int mode,
 		int transp,
-		bool transparant,
+		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 772625b8a0b..ad476e492d0 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -117,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;
@@ -985,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);
 
@@ -1241,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);
 		}
@@ -1305,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.
diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.cpp b/source/gameengine/Rasterizer/RAS_BucketManager.cpp
index 14ee9a0e2c7..82bdce44519 100644
--- a/source/gameengine/Rasterizer/RAS_BucketManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_BucketManager.cpp
@@ -94,7 +94,6 @@ void RAS_BucketManager::RenderAlphaBuckets(
 	const MT_Scalar cam_origin = cameratrans.getOrigin()[2];
 	for (bit = m_AlphaBuckets.begin(); bit != m_AlphaBuckets.end(); ++bit)
 	{
-		(*bit)->ClearScheduledPolygons();
 		for (mit = (*bit)->msBegin(); mit != (*bit)->msEnd(); ++mit)
 		{
 			if ((*mit).m_bVisible)
@@ -133,22 +132,9 @@ void RAS_BucketManager::Renderbuckets(
 	rasty->ClearCachingInfo();
 
 	RAS_MaterialBucket::StartFrame();
-	for (bucket = m_MaterialBuckets.begin(); bucket != m_MaterialBuckets.end(); ++bucket)
-	{
-		(*bucket)->ClearScheduledPolygons();
-	}
 	
 	for (bucket = m_MaterialBuckets.begin(); bucket != m_MaterialBuckets.end(); ++bucket)
-	{
-		RAS_IPolyMaterial *tmp = (*bucket)->GetPolyMaterial();
-		if(tmp->IsZSort() || tmp->GetFlag() &RAS_FORCEALPHA )
-			rasty->SetAlphaTest(true);
-		else
-			rasty->SetAlphaTest(false);
-
 		(*bucket)->Render(cameratrans,rasty,rendertools);
-	}
-	rasty->SetAlphaTest(false);
 
 	RenderAlphaBuckets(cameratrans, rasty, rendertools);	
 	RAS_MaterialBucket::EndFrame();
@@ -172,7 +158,7 @@ RAS_MaterialBucket* RAS_BucketManager::FindBucket(RAS_IPolyMaterial * material,
 	
 	RAS_MaterialBucket *bucket = new RAS_MaterialBucket(material);
 	bucketCreated = true;
-	if (bucket->IsTransparant())
+	if (bucket->IsAlpha())
 		m_AlphaBuckets.push_back(bucket);
 	else
 		m_MaterialBuckets.push_back(bucket);
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
index 3c0014ab3ba..4ee06d96603 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
@@ -40,7 +40,7 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname,
 									 int tileyrep,
 									 int mode,
 									 int transp,
-									 bool transparant,
+									 bool alpha,
 									 bool zsort,
 									 int lightlayer,
 									 bool bIsTriangle,
@@ -53,7 +53,7 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname,
 		m_tileyrep(tileyrep),
 		m_drawingmode (mode),
 		m_transp(transp),
-		m_transparant(transparant),
+		m_alpha(alpha),
 		m_zsort(zsort),
 		m_lightlayer(lightlayer),
 		m_bIsTriangle(bIsTriangle),
@@ -88,8 +88,8 @@ bool RAS_IPolyMaterial::Equals(const RAS_IPolyMaterial& lhs) const
 				this->m_tile		==		lhs.m_tile &&
 				this->m_tilexrep	==		lhs.m_tilexrep &&
 				this->m_tileyrep	==		lhs.m_tileyrep &&
-				this->m_transparant	==		lhs.m_transparant &&
 				this->m_transp		==		lhs.m_transp &&
+				this->m_alpha		==		lhs.m_alpha &&
 				this->m_zsort		==		lhs.m_zsort &&
 				this->m_drawingmode	==		lhs.m_drawingmode &&
 				this->m_bIsTriangle	==		lhs.m_bIsTriangle &&
@@ -113,9 +113,9 @@ int RAS_IPolyMaterial::GetLightLayer() const
 	return m_lightlayer;
 }
 
-bool RAS_IPolyMaterial::IsTransparant() const
+bool RAS_IPolyMaterial::IsAlpha() const
 {
-	return m_transparant;
+	return m_alpha || m_zsort;
 }
 
 bool RAS_IPolyMaterial::IsZSort() const
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
index 2951a21507d..8fc53e6b038 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
@@ -52,7 +52,7 @@ enum MaterialProps
 	RAS_AUTOGEN		=128,
 	RAS_NORMAL		=256,
 	RAS_DEFMULTI	=512,
-	RAS_FORCEALPHA	=1024
+	RAS_BLENDERGLSL =1024
 };
 
 /**
@@ -67,8 +67,8 @@ protected:
 	int						m_tile;
 	int						m_tilexrep,m_tileyrep;
 	int						m_drawingmode;	// tface->mode
-	bool					m_transparant;
 	int						m_transp;
+	bool					m_alpha;
 	bool					m_zsort;
 	int						m_lightlayer;
 	bool					m_bIsTriangle;
@@ -104,7 +104,7 @@ public:
 					  int tileyrep,
 					  int mode,
 					  int transp,
-					  bool transparant,
+					  bool alpha,
 					  bool zsort,
 					  int lightlayer,
 					  bool bIsTriangle,
@@ -134,7 +134,7 @@ public:
 	virtual bool				Equals(const RAS_IPolyMaterial& lhs) const;
 	bool				Less(const RAS_IPolyMaterial& rhs) const;
 	int					GetLightLayer() const;
-	bool				IsTransparant() const;
+	bool				IsAlpha() const;
 	bool				IsZSort() const;
 	bool				UsesTriangles() const;
 	unsigned int		hash() const;
diff --git a/source/gameengine/Rasterizer/RAS_IRasterizer.h b/source/gameengine/Rasterizer/RAS_IRasterizer.h
index d4a9177a85d..9e03212283e 100644
--- a/source/gameengine/Rasterizer/RAS_IRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_IRasterizer.h
@@ -372,10 +372,6 @@ public:
 	
 	virtual void	SetAmbientColor(float red, float green, float blue)=0;
 	virtual void	SetAmbient(float factor)=0;
-	/**
-	 * Sets alpha testing
-	 */
-	virtual void	SetAlphaTest(bool enable)=0;
 
 	/**
 	 * Sets a polygon offset.  z depth will be: z1 = mult*z0 + add
@@ -398,8 +394,10 @@ public:
 	virtual void	DisableMotionBlur()=0;
 	
 	virtual float	GetMotionBlurValue()=0;
-	virtual int	GetMotionBlurState()=0;
-	virtual void SetMotionBlurState(int newstate)=0;
+	virtual int		GetMotionBlurState()=0;
+	virtual void	SetMotionBlurState(int newstate)=0;
+
+	virtual void	SetBlendingMode(int blendmode)=0;
 };
 
 #endif //__RAS_IRASTERIZER
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
index e295d69e48e..0015b6a251f 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
@@ -76,26 +76,11 @@ KX_MeshSlot::~KX_MeshSlot()
 RAS_MaterialBucket::RAS_MaterialBucket(RAS_IPolyMaterial* mat)
 	:m_bModified(true)
 {
-	m_bScheduled=true;
 	m_material = mat;
 }
 
 
 
-void RAS_MaterialBucket::SchedulePolygons(int drawingmode)
-{ 
-	m_bScheduled = true;
-}
-
-
-
-void RAS_MaterialBucket::ClearScheduledPolygons()
-{ 
-	m_bScheduled = false;
-}
-
-	
-
 RAS_IPolyMaterial* RAS_MaterialBucket::GetPolyMaterial() const
 { 
 	return m_material;
@@ -134,9 +119,14 @@ void RAS_MaterialBucket::MarkVisibleMeshSlot(KX_MeshSlot& ms,
 	(*it).m_RGBAcolor= rgbavec;
 }
 
-bool RAS_MaterialBucket::IsTransparant() const
+bool RAS_MaterialBucket::IsAlpha() const
+{	
+	return (m_material->IsAlpha());
+}
+
+bool RAS_MaterialBucket::IsZSort() const
 {	
-	return (m_material->IsTransparant());
+	return (m_material->IsZSort());
 }
 
 
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.h b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
index 13d8a53714a..4eef889c533 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.h
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
@@ -125,11 +125,9 @@ public:
 					   class RAS_IRasterizer* rasty,
 					   class RAS_IRenderTools* rendertools);
 	
-	void	SchedulePolygons(int drawingmode);
-	void	ClearScheduledPolygons();
-	
 	RAS_IPolyMaterial*		GetPolyMaterial() const;
-	bool	IsTransparant() const;
+	bool	IsAlpha() const;
+	bool	IsZSort() const;
 		
 	static void	StartFrame();
 	static void EndFrame();
@@ -162,7 +160,6 @@ public:
 private:
 	
 	T_MeshSlotList				m_meshSlots;
-	bool						m_bScheduled;
 	bool						m_bModified;
 	RAS_IPolyMaterial*			m_material;
 	double*						m_pOGLMatrix;
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
index 5087f62500e..9c0460aad2d 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
@@ -203,7 +203,6 @@ void RAS_MeshObject::DebugColor(unsigned int abgr)
 
 void RAS_MeshObject::SetVertexColor(RAS_IPolyMaterial* mat,MT_Vector4 rgba)
 {
-	RAS_TexVert* vertex = NULL;
 	const vecVertexArray & vertexvec = GetVertexCache(mat);
 			
 	for (vector<KX_VertexArray*>::const_iterator it = vertexvec.begin(); it != vertexvec.end(); ++it)
@@ -220,22 +219,17 @@ void RAS_MeshObject::SchedulePoly(const KX_VertexIndex& idx,
 								  int numverts,
 								  RAS_IPolyMaterial* mat)
 {
-	//int indexpos = m_IndexArrayCount[idx.m_vtxarray];
-	//m_IndexArrayCount[idx.m_vtxarray] = indexpos + 3;
-	
 	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);
+
 	ao->m_IndexArrayCache1[idx.m_vtxarray]->push_back(idx.m_indexarray[0]);
 	ao->m_IndexArrayCache1[idx.m_vtxarray]->push_back(idx.m_indexarray[1]);
 	ao->m_IndexArrayCache1[idx.m_vtxarray]->push_back(idx.m_indexarray[2]);
-	if (!mat->UsesTriangles()) //if (!m_bUseTriangles)
-	{	
-		//m_IndexArrayCount[idx.m_vtxarray] = indexpos+4;
+
+	if (!mat->UsesTriangles())
 		ao->m_IndexArrayCache1[idx.m_vtxarray]->push_back(idx.m_indexarray[3]);
-	}
 }
 
 
-
 void RAS_MeshObject::ScheduleWireframePoly(const KX_VertexIndex& idx,
 										   int numverts,
 										   int edgecode,
@@ -422,7 +416,6 @@ void RAS_MeshObject::Bucketize(double* oglmatrix,
 	for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();++it)
 	{
 		RAS_MaterialBucket* bucket = *it;
-		bucket->SchedulePolygons(0);
 //		KX_ArrayOptimizer* oa = GetArrayOptimizer(bucket->GetPolyMaterial());
 		bucket->SetMeshSlot(ms);
 	}
@@ -447,7 +440,6 @@ void RAS_MeshObject::MarkVisible(double* oglmatrix,
 	for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();++it)
 	{
 		RAS_MaterialBucket* bucket = *it;
-		bucket->SchedulePolygons(0);
 //		KX_ArrayOptimizer* oa = GetArrayOptimizer(bucket->GetPolyMaterial());
 		bucket->MarkVisibleMeshSlot(ms,visible,useObjectColor,rgbavec);
 	}
@@ -466,7 +458,6 @@ void RAS_MeshObject::RemoveFromBuckets(double* oglmatrix,
 	{
 		RAS_MaterialBucket* bucket = *it;
 //		RAS_IPolyMaterial* polymat = bucket->GetPolyMaterial();
-		bucket->SchedulePolygons(0);
 		//KX_ArrayOptimizer* oa = GetArrayOptimizer(polymat);
 		bucket->RemoveMeshSlot(ms);
 	}
@@ -585,31 +576,36 @@ void RAS_MeshObject::UpdateMaterialList()
 
 struct RAS_MeshObject::polygonSlot
 {
-	float        m_z;
-	RAS_Polygon *m_poly;
-		
-	polygonSlot(float z, RAS_Polygon* poly) :
-		m_z(z),
-		m_poly(poly)
-	{}
-	/**
-	 * pnorm and pval form the plane equation that the distance from is used to
-	 * sort against.
-	 */
-        polygonSlot(const MT_Vector3 &pnorm, const MT_Scalar &pval, RAS_MeshObject *mesh, RAS_Polygon* poly) :
-			m_poly(poly)
+	float m_z;
+	int m_index[4];
+	
+	polygonSlot() {}
+
+	/* pnorm is the normal from the plane equation that the distance from is
+	 * used to sort again. */
+	void get(const KX_VertexArray& vertexarray, const KX_IndexArray& indexarray,
+		int offset, int nvert, const MT_Vector3& pnorm)
 	{
-		const KX_VertexIndex &base = m_poly->GetIndexBase();
-		RAS_TexVert *vert = mesh->GetVertex(base.m_vtxarray, base.m_indexarray[0], poly->GetMaterial()->GetPolyMaterial());
-		m_z = MT_dot(pnorm, vert->getLocalXYZ()) + pval;
-		
-		for(int i = 1; i < m_poly->VertexCount(); i++)
-		{
-			vert = mesh->GetVertex(base.m_vtxarray, base.m_indexarray[i], poly->GetMaterial()->GetPolyMaterial());
-			float z = MT_dot(pnorm, vert->getLocalXYZ()) + pval;
-			m_z += z;
+		MT_Vector3 center(0, 0, 0);
+		int i;
+
+		for(i=0; i<nvert; i++) {
+			m_index[i] = indexarray[offset+i];
+			center += vertexarray[m_index[i]].getLocalXYZ();
 		}
-		m_z /= m_poly->VertexCount();
+
+		/* note we don't divide center by the number of vertices, since all
+		 * polygons have the same number of vertices, and that we leave out
+		 * the 4-th component of the plane equation since it is constant. */
+		m_z = MT_dot(pnorm, center);
+	}
+
+	void set(KX_IndexArray& indexarray, int offset, int nvert)
+	{
+		int i;
+
+		for(i=0; i<nvert; i++)
+			indexarray[offset+i] = m_index[i];
 	}
 };
 	
@@ -629,100 +625,100 @@ struct RAS_MeshObject::fronttoback
 	}
 };
 
-
 void RAS_MeshObject::SortPolygons(const MT_Transform &transform)
 {
+	// Limitations: sorting is quite simple, and handles many
+	// cases wrong, partially due to polygons being sorted per
+	// bucket.
+	// 
+	// a) mixed triangles/quads are sorted wrong
+	// b) mixed materials are sorted wrong
+	// c) more than 65k faces are sorted wrong
+	// d) intersecting objects are sorted wrong
+	// e) intersecting polygons are sorted wrong
+	//
+	// a) can be solved by making all faces either triangles or quads
+	// if they need to be z-sorted. c) could be solved by allowing
+	// larger buckets, b) and d) cannot be solved easily if we want
+	// to avoid excessive state changes while drawing. e) would
+	// require splitting polygons.
+
 	if (!m_zsort)
 		return;
-		
+
 	// Extract camera Z plane...
 	const MT_Vector3 pnorm(transform.getBasis()[2]);
-	const MT_Scalar pval = transform.getOrigin()[2];
-	
-	unsigned int numpolys = m_Polygons.size();
-	std::multiset<polygonSlot, backtofront> alphapolyset;
-	std::multiset<polygonSlot, fronttoback> solidpolyset;
-	
-	for (unsigned int p = 0; p < numpolys; p++)
-	{
-		RAS_Polygon* poly = m_Polygons[p];
-		if (poly->IsVisible())
-		{
-			if (poly->GetMaterial()->GetPolyMaterial()->IsTransparant())
-			{
-				alphapolyset.insert(polygonSlot(pnorm, pval, this, poly));
-			} else {
-				solidpolyset.insert(polygonSlot(pnorm, pval, this, poly));
-			}
-		}
-	}
-	
-	// Clear current array data.
+	// unneeded: const MT_Scalar pval = transform.getOrigin()[2];
+
 	for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();++it)
 	{
-		vector<KX_IndexArray*> *indexcache = &GetArrayOptimizer((*it)->GetPolyMaterial())->m_IndexArrayCache1;
-		for (vector<KX_IndexArray*>::iterator iit = indexcache->begin(); iit != indexcache->end(); ++iit)
-			(*iit)->clear();
-	}
+		if(!(*it)->IsZSort())
+			continue;
 
-	std::multiset<polygonSlot, fronttoback>::iterator sit = solidpolyset.begin();
-	for (; sit != solidpolyset.end(); ++sit)
-		SchedulePoly((*sit).m_poly->GetVertexIndexBase(), (*sit).m_poly->VertexCount(), (*sit).m_poly->GetMaterial()->GetPolyMaterial());
-	
-	std::multiset<polygonSlot, backtofront>::iterator ait = alphapolyset.begin();
-	for (; ait != alphapolyset.end(); ++ait)
-		SchedulePoly((*ait).m_poly->GetVertexIndexBase(), (*ait).m_poly->VertexCount(), (*ait).m_poly->GetMaterial()->GetPolyMaterial());
+		RAS_IPolyMaterial *mat = (*it)->GetPolyMaterial();
+		KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);
+
+		vecIndexArrays& indexarrays = ao->m_IndexArrayCache1;
+		vecVertexArray& vertexarrays = ao->m_VertexArrayCache1;
+		unsigned int i, j, nvert = (mat->UsesTriangles())? 3: 4;
+
+		for(i=0; i<indexarrays.size(); i++) {
+			KX_IndexArray& indexarray = *indexarrays[i];
+			KX_VertexArray& vertexarray = *vertexarrays[i];
+
+			unsigned int totpoly = indexarray.size()/nvert;
+			vector<polygonSlot> slots(totpoly);
+
+			/* get indices and z into temporary array */
+			for(j=0; j<totpoly; j++)
+				slots[j].get(vertexarray, indexarray, j*nvert, nvert, pnorm);
+
+			/* sort (stable_sort might be better, if flickering happens?) */
+			sort(slots.begin(), slots.end(), backtofront());
+
+			/* get indices from temporary array again */
+			for(j=0; j<totpoly; j++)
+				slots[j].set(indexarray, j*nvert, nvert);
+		}
+	}
 }
 
 
-void RAS_MeshObject::SchedulePolygons(const MT_Transform &transform, int drawingmode)
+void RAS_MeshObject::SchedulePolygons(int drawingmode)
 {
-//	int nummaterials = m_materials.size();
-	int i;
-
 	if (m_bModified)
 	{
-		for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();++it)
-		{
-			RAS_MaterialBucket* bucket = *it;
+		int i, numpolys = m_Polygons.size();
 
-			bucket->SchedulePolygons(drawingmode);
-			if (bucket->GetPolyMaterial()->IsZSort())
+		for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();++it)
+			if ((*it)->IsZSort())
 				m_zsort = true;
-		}
-
-		int numpolys = m_Polygons.size();
 		
-		if ((drawingmode > RAS_IRasterizer::KX_BOUNDINGBOX) && 
-			(drawingmode < RAS_IRasterizer::KX_SOLID))
+		if (drawingmode == RAS_IRasterizer::KX_WIREFRAME)
 		{
 			for (i=0;i<numpolys;i++)
 			{
 				RAS_Polygon* poly = m_Polygons[i];
 				if (poly->IsVisible())
-					ScheduleWireframePoly(poly->GetVertexIndexBase(),poly->VertexCount(),poly->GetEdgeCode()
-					,poly->GetMaterial()->GetPolyMaterial());
+					ScheduleWireframePoly(poly->GetVertexIndexBase(),poly->VertexCount(),poly->GetEdgeCode(),
+						poly->GetMaterial()->GetPolyMaterial());
 				
 			}
 			m_zsort = false;
 		}
 		else
 		{
-			if (!m_zsort)
+			for (i=0;i<numpolys;i++)
 			{
-				for (i=0;i<numpolys;i++)
-				{
-					RAS_Polygon* poly = m_Polygons[i];
-					if (poly->IsVisible())
-					{
-						SchedulePoly(poly->GetVertexIndexBase(),poly->VertexCount(),poly->GetMaterial()->GetPolyMaterial());
-					}
-				}
+				RAS_Polygon* poly = m_Polygons[i];
+				if (poly->IsVisible())
+					SchedulePoly(poly->GetVertexIndexBase(),poly->VertexCount(),
+						poly->GetMaterial()->GetPolyMaterial());
 			}
 		}
 
 		m_bModified = false;
-
 		m_MeshMod = true;
 	} 
 }
+
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h
index 44ad508d1e8..99806666fa6 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.h
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.h
@@ -137,6 +137,18 @@ class RAS_MeshObject
 	struct backtofront;
 	struct fronttoback;
 
+	void				SchedulePoly(
+							const KX_VertexIndex& idx,
+							int numverts,
+							RAS_IPolyMaterial* mat
+						);
+
+	void				ScheduleWireframePoly(
+							const KX_VertexIndex& idx,
+							int numverts,
+							int edgecode,
+							RAS_IPolyMaterial* mat
+						);
 	
 protected:
 	enum { BUCKET_MAX_INDICES = 65535 };//2048};//8192};
@@ -196,10 +208,7 @@ public:
 	 */
 	void				SortPolygons(const MT_Transform &transform);
 
-	void				SchedulePolygons(
-							const MT_Transform &transform,
-							int drawingmode
-						);
+	void				SchedulePolygons(int drawingmode);
 
 	void				ClearArrayData();
 	
@@ -216,19 +225,7 @@ public:
 							int numverts,
 							RAS_IPolyMaterial* polymat
 						);
-	
-	void				SchedulePoly(
-							const KX_VertexIndex& idx,
-							int numverts,
-							RAS_IPolyMaterial* mat
-						);
 
-	void				ScheduleWireframePoly(
-							const KX_VertexIndex& idx,
-							int numverts,
-							int edgecode,
-							RAS_IPolyMaterial* mat
-						);
 	
 	// find (and share) or add vertices
 	// for some speedup, only the last 20 added vertices are searched for equality
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
index 5dae911aa82..40072159db8 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
@@ -39,6 +39,7 @@
 #include "RAS_IRenderTools.h" // rendering text
 
 #include "GPU_draw.h"
+#include "GPU_material.h"
 
 /**
  *  32x32 bit masks for vinterlace stereo mode
@@ -69,6 +70,7 @@ RAS_OpenGLRasterizer::RAS_OpenGLRasterizer(RAS_ICanvas* canvas)
 	m_motionblurvalue(-1.0),
 	m_texco_num(0),
 	m_attrib_num(0),
+	m_last_blendmode(GPU_BLEND_SOLID),
 	m_materialCachingInfo(0)
 {
 	m_viewmatrix.Identity();
@@ -101,6 +103,8 @@ bool RAS_OpenGLRasterizer::Init()
 	m_ambg = 0.0f;
 	m_ambb = 0.0f;
 
+	SetBlendingMode(GPU_BLEND_SOLID);
+
 	glClearColor(m_redback,m_greenback,m_blueback,m_alphaback);
 	glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -119,18 +123,6 @@ void RAS_OpenGLRasterizer::SetAmbientColor(float red, float green, float blue)
 }
 
 
-void RAS_OpenGLRasterizer::SetAlphaTest(bool enable)
-{
-	if (enable)
-	{
-		glEnable(GL_ALPHA_TEST);
-		glAlphaFunc(GL_GREATER, 0.6f);
-	}
-	else glDisable(GL_ALPHA_TEST);
-}
-
-
-
 void RAS_OpenGLRasterizer::SetAmbient(float factor)
 {
 	float ambient[] = { m_ambr*factor, m_ambg*factor, m_ambb*factor, 1.0f };
@@ -283,6 +275,8 @@ bool RAS_OpenGLRasterizer::BeginFrame(int drawingmode, double time)
 		glEnable (GL_CULL_FACE);
 	}
 
+	SetBlendingMode(GPU_BLEND_SOLID);
+
 	glShadeModel(GL_SMOOTH);
 
 	m_2DCanvas->BeginFrame();
@@ -1333,3 +1327,34 @@ void RAS_OpenGLRasterizer::DisableMotionBlur()
 	m_motionblur = 0;
 	m_motionblurvalue = -1.0;
 }
+
+void RAS_OpenGLRasterizer::SetBlendingMode(int blendmode)
+{
+	if(blendmode == m_last_blendmode)
+		return;
+
+	if(blendmode == GPU_BLEND_SOLID) {
+		glDisable(GL_BLEND);
+		glDisable(GL_ALPHA_TEST);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	}
+	else if(blendmode == GPU_BLEND_ADD) {
+		glBlendFunc(GL_ONE, GL_ONE);
+		glEnable(GL_BLEND);
+		glDisable(GL_ALPHA_TEST);
+	}
+	else if(blendmode == GPU_BLEND_ALPHA) {
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glEnable(GL_BLEND);
+		glEnable(GL_ALPHA_TEST);
+		glAlphaFunc(GL_GREATER, 0.0f);
+	}
+	else if(blendmode == GPU_BLEND_CLIP) {
+		glDisable(GL_BLEND); 
+		glEnable(GL_ALPHA_TEST);
+		glAlphaFunc(GL_GREATER, 0.5f);
+	}
+
+	m_last_blendmode = blendmode;
+}
+
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
index 0d54552db05..02056cce446 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
@@ -99,6 +99,7 @@ protected:
 	TexCoGen		m_attrib[RAS_MAX_ATTRIB];
 	int				m_texco_num;
 	int				m_attrib_num;
+	int				m_last_blendmode;
 
 	/** Stores the caching information for the last material activated. */
 	RAS_IPolyMaterial::TCachingInfo m_materialCachingInfo;
@@ -142,8 +143,6 @@ public:
 	virtual void	SetFocalLength(const float focallength);
 	virtual float	GetFocalLength();
 
-	virtual void	SetAlphaTest(bool enable);
-
 	virtual void	SwapBuffers();
 	virtual void	IndexPrimitives(
 						const vecVertexArray& vertexarrays,
@@ -282,8 +281,8 @@ public:
 	virtual void	EnableMotionBlur(float motionblurvalue);
 	virtual void	DisableMotionBlur();
 	virtual float	GetMotionBlurValue(){return m_motionblurvalue;};
-	virtual int	GetMotionBlurState(){return m_motionblur;};
-	virtual void SetMotionBlurState(int newstate)
+	virtual int		GetMotionBlurState(){return m_motionblur;};
+	virtual void	SetMotionBlurState(int newstate)
 	{
 		if(newstate<0) 
 			m_motionblur = 0;
@@ -292,6 +291,8 @@ public:
 		else 
 			m_motionblur = newstate;
 	};
+
+	virtual void	SetBlendingMode(int blendmode);
 };
 
 #endif //__RAS_OPENGLRASTERIZER
diff --git a/source/gameengine/Rasterizer/RAS_Polygon.cpp b/source/gameengine/Rasterizer/RAS_Polygon.cpp
index 852c94def3f..b74cb9cfcac 100644
--- a/source/gameengine/Rasterizer/RAS_Polygon.cpp
+++ b/source/gameengine/Rasterizer/RAS_Polygon.cpp
@@ -37,24 +37,6 @@
 
 #include "RAS_Polygon.h"
 
-/*
-RAS_TexVert*	RAS_Polygon::GetVertex(int index)
-{ 
-		if (m_bucket)
-			return m_bucket->GetVertex(m_vertexindexbase.m_vtxarray, m_vertexindexbase.m_indexarray[index]);
-		else
-			return NULL;
-}
-*/
-
-/*void RAS_Polygon::Bucketize(double* oglmatrix)
-{
-		//Transform(trans);
-		if (m_bucket)
-			m_bucket->AddPolygon(this,oglmatrix);
-}
-*/
-
 RAS_Polygon::RAS_Polygon(RAS_MaterialBucket* bucket,
 				bool visible,
 				int numverts,