2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317

Notes:
* Sequence transform strip uses G.scene global, this is commented
  out now, should be fixed.
* Etch-a-ton code was most difficult to merge. The files already in
  2.5 got merged, but no new files were added. Calls to these files
  are commented out with "XXX etch-a-ton". editarmature.c and
  transform_snap.c were complex to merge. Martin, please check?
* Game engine compiles and links again here for scons/make/cmake
  (player still fails to link).

11 files changed, 128 insertions, 123 deletions

diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp
index 536faa11b03..ce555fc1aeb 100644
--- a/source/gameengine/Converter/BL_ActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ActionActuator.cpp
@@ -391,7 +391,7 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
 				
 				/* Find percentages */
 				newweight = (m_blendframe/(float)m_blendin);
-				blend_poses(m_pose, m_blendpose, 1.0 - newweight, ACTSTRIPMODE_BLEND);
+				// XXX blend_poses(m_pose, m_blendpose, 1.0 - newweight, ACTSTRIPMODE_BLEND);
 
 				/* Increment current blending percentage */
 				m_blendframe = (curtime - m_blendstart)*KX_KetsjiEngine::GetAnimFrameRate();
@@ -1035,8 +1035,8 @@ PyAttributeDef BL_ActionActuator::Attributes[] = {
 	{ NULL }	//Sentinel
 };
 
-PyObject* BL_ActionActuator::_getattr(const STR_String& attr) {
-	if (attr == "action")
+PyObject* BL_ActionActuator::_getattr(const char *attr) {
+	if (!strcmp(attr, "action"))
 		return PyString_FromString(m_action->id.name+2);
 	PyObject* object = _getattr_self(Attributes, this, attr);
 	if (object != NULL)
@@ -1044,8 +1044,8 @@ PyObject* BL_ActionActuator::_getattr(const STR_String& attr) {
 	_getattr_up(SCA_IActuator);
 }
 
-int BL_ActionActuator::_setattr(const STR_String& attr, PyObject* value) {
-	if (attr == "action")
+int BL_ActionActuator::_setattr(const char *attr, PyObject* value) {
+	if (!strcmp(attr, "action"))
 	{
 		if (!PyString_Check(value))
 		{
diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h
index 6e291106553..6161048afb8 100644
--- a/source/gameengine/Converter/BL_ActionActuator.h
+++ b/source/gameengine/Converter/BL_ActionActuator.h
@@ -110,8 +110,8 @@ public:
 
 	KX_PYMETHOD_DOC(BL_ActionActuator,setChannel);
 
-	virtual PyObject* _getattr(const STR_String& attr);
-	virtual int _setattr(const STR_String& attr, PyObject* value);
+	virtual PyObject* _getattr(const char *attr);
+	virtual int _setattr(const char *attr, PyObject* value);
 
 	/* attribute check */
 	static int CheckFrame(void *self, const PyAttributeDef*)
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 45461205fbb..da74fa49cba 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -361,7 +361,7 @@ BL_Material* ConvertMaterial(
 			facetex = true;
 		if(validface && mat->mtex[0]) {
 			MTex *tmp = mat->mtex[0];
-			if(!tmp->tex || tmp->tex && !tmp->tex->ima )
+			if(!tmp->tex || (tmp->tex && !tmp->tex->ima))
 				facetex = true;
 		}
 		numchan = numchan>MAXTEX?MAXTEX:numchan;
@@ -593,7 +593,7 @@ BL_Material* ConvertMaterial(
 	MT_Point2 uv2[4];
 	const char *uvName = "", *uv2Name = "";
 
-	uv[0]= uv[1]= uv[2]= uv[3]= MT_Point2(0.0f, 0.0f);
+	
 	uv2[0]= uv2[1]= uv2[2]= uv2[3]= MT_Point2(0.0f, 0.0f);
 
 	if( validface ) {
@@ -607,12 +607,12 @@ BL_Material* ConvertMaterial(
 		material->tile	= tface->tile;
 		material->mode	= tface->mode;
 			
-		uv[0]	= MT_Point2(tface->uv[0]);
-		uv[1]	= MT_Point2(tface->uv[1]);
-		uv[2]	= MT_Point2(tface->uv[2]);
+		uv[0].setValue(tface->uv[0]);
+		uv[1].setValue(tface->uv[1]);
+		uv[2].setValue(tface->uv[2]);
 
 		if (mface->v4) 
-			uv[3]	= MT_Point2(tface->uv[3]);
+			uv[3].setValue(tface->uv[3]);
 
 		uvName = tfaceName;
 	} 
@@ -622,6 +622,8 @@ BL_Material* ConvertMaterial(
 		material->mode		= default_face_mode;	
 		material->transp	= TF_SOLID;
 		material->tile		= 0;
+		
+		uv[0]= uv[1]= uv[2]= uv[3]= MT_Point2(0.0f, 0.0f);
 	}
 
 	// with ztransp enabled, enforce alpha blending mode
@@ -665,14 +667,14 @@ BL_Material* ConvertMaterial(
 					{
 						MT_Point2 uvSet[4];
 
-						uvSet[0]	= MT_Point2(layer.face->uv[0]);
-						uvSet[1]	= MT_Point2(layer.face->uv[1]);
-						uvSet[2]	= MT_Point2(layer.face->uv[2]);
+						uvSet[0].setValue(layer.face->uv[0]);
+						uvSet[1].setValue(layer.face->uv[1]);
+						uvSet[2].setValue(layer.face->uv[2]);
 
 						if (mface->v4) 
-							uvSet[3]	= MT_Point2(layer.face->uv[3]);
+							uvSet[3].setValue(layer.face->uv[3]);
 						else
-							uvSet[3]	= MT_Point2(0.0f, 0.0f);
+							uvSet[3].setValue(0.0f, 0.0f);
 
 						if (isFirstSet)
 						{
@@ -790,10 +792,10 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 		MT_Vector4 tan0(0,0,0,0), tan1(0,0,0,0), tan2(0,0,0,0), tan3(0,0,0,0);
 
 		/* 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);
+		pt0.setValue(mvert[mface->v1].co);
+		pt1.setValue(mvert[mface->v2].co);
+		pt2.setValue(mvert[mface->v3].co);
+		if (mface->v4) pt3.setValue(mvert[mface->v4].co);
 
 		if(mface->flag & ME_SMOOTH) {
 			float n0[3], n1[3], n2[3], n3[3];
@@ -894,12 +896,12 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 					
 					visible = !((mface->flag & ME_HIDE)||(tface->mode & TF_INVISIBLE));
 					
-					uv0 = MT_Point2(tface->uv[0]);
-					uv1 = MT_Point2(tface->uv[1]);
-					uv2 = MT_Point2(tface->uv[2]);
+					uv0.setValue(tface->uv[0]);
+					uv1.setValue(tface->uv[1]);
+					uv2.setValue(tface->uv[2]);
 	
 					if (mface->v4)
-						uv3 = MT_Point2(tface->uv[3]);
+						uv3.setValue(tface->uv[3]);
 				} 
 				else {
 					/* no texfaces, set COLLSION true and everything else FALSE */
@@ -960,7 +962,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 					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_specular.setValue(0.0f,0.0f,0.0f);
 					polymat->m_shininess = 35.0;
 				}
 			}
@@ -1313,6 +1315,12 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
 		CreateMaterialFromBlenderObject(blenderobject, kxscene);
 					
 	KX_ObjectProperties objprop;
+	objprop.m_lockXaxis = (blenderobject->gameflag2 & OB_LOCK_RIGID_BODY_X_AXIS) !=0;
+	objprop.m_lockYaxis = (blenderobject->gameflag2 & OB_LOCK_RIGID_BODY_Y_AXIS) !=0;
+	objprop.m_lockZaxis = (blenderobject->gameflag2 & OB_LOCK_RIGID_BODY_Z_AXIS) !=0;
+	objprop.m_lockXRotaxis = (blenderobject->gameflag2 & OB_LOCK_RIGID_BODY_X_ROT_AXIS) !=0;
+	objprop.m_lockYRotaxis = (blenderobject->gameflag2 & OB_LOCK_RIGID_BODY_Y_ROT_AXIS) !=0;
+	objprop.m_lockZRotaxis = (blenderobject->gameflag2 & OB_LOCK_RIGID_BODY_Z_ROT_AXIS) !=0;
 
 	objprop.m_isCompoundChild = isCompoundChild;
 	objprop.m_hasCompoundChildren = (blenderobject->gameflag & OB_CHILD) != 0;
@@ -1911,21 +1919,14 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 			MT_Matrix3x3 angor;			
 			if (converter->addInitFromFrame) blenderscene->r.cfra=blenderscene->r.sfra;
 			
-			MT_Point3 pos = MT_Point3(
+			MT_Point3 pos;
+			pos.setValue(
 				blenderobject->loc[0]+blenderobject->dloc[0],
 				blenderobject->loc[1]+blenderobject->dloc[1],
 				blenderobject->loc[2]+blenderobject->dloc[2]
 			);
-			MT_Vector3 eulxyz = MT_Vector3(
-				blenderobject->rot[0],
-				blenderobject->rot[1],
-				blenderobject->rot[2]
-			);
-			MT_Vector3 scale = MT_Vector3(
-				blenderobject->size[0],
-				blenderobject->size[1],
-				blenderobject->size[2]
-			);
+			MT_Vector3 eulxyz(blenderobject->rot);
+			MT_Vector3 scale(blenderobject->size);
 			if (converter->addInitFromFrame){//rcruiz
 				float eulxyzPrev[3];
 				blenderscene->r.cfra=blenderscene->r.sfra-1;
@@ -1997,18 +1998,18 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 				MT_Vector3 x(ori.getColumn(0));
 				MT_Vector3 y(ori.getColumn(1));
 				MT_Vector3 z(ori.getColumn(2));
-				MT_Vector3 scale(x.length(), y.length(), z.length());
-				if (!MT_fuzzyZero(scale[0]))
-					x /= scale[0];
-				if (!MT_fuzzyZero(scale[1]))
-					y /= scale[1];
-				if (!MT_fuzzyZero(scale[2]))
-					z /= scale[2];
+				MT_Vector3 parscale(x.length(), y.length(), z.length());
+				if (!MT_fuzzyZero(parscale[0]))
+					x /= parscale[0];
+				if (!MT_fuzzyZero(parscale[1]))
+					y /= parscale[1];
+				if (!MT_fuzzyZero(parscale[2]))
+					z /= parscale[2];
 				ori.setColumn(0, x);								
 				ori.setColumn(1, y);								
 				ori.setColumn(2, z);								
 				parentinversenode->SetLocalOrientation(ori);
-				parentinversenode->SetLocalScale(scale);
+				parentinversenode->SetLocalScale(parscale);
 				
 				parentinversenode->AddChild(gameobj->GetSGNode());
 			}
@@ -2113,21 +2114,13 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 							if (converter->addInitFromFrame) 
 								blenderscene->r.cfra=blenderscene->r.sfra;
 							
-							MT_Point3 pos = MT_Point3(
+							MT_Point3 pos(
 								blenderobject->loc[0]+blenderobject->dloc[0],
 								blenderobject->loc[1]+blenderobject->dloc[1],
 								blenderobject->loc[2]+blenderobject->dloc[2]
 							);
-							MT_Vector3 eulxyz = MT_Vector3(
-								blenderobject->rot[0],
-								blenderobject->rot[1],
-								blenderobject->rot[2]
-							);
-							MT_Vector3 scale = MT_Vector3(
-								blenderobject->size[0],
-								blenderobject->size[1],
-								blenderobject->size[2]
-							);
+							MT_Vector3 eulxyz(blenderobject->rot);
+							MT_Vector3 scale(blenderobject->size);
 							if (converter->addInitFromFrame){//rcruiz
 								float eulxyzPrev[3];
 								blenderscene->r.cfra=blenderscene->r.sfra-1;
@@ -2194,18 +2187,18 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 								MT_Vector3 x(ori.getColumn(0));
 								MT_Vector3 y(ori.getColumn(1));
 								MT_Vector3 z(ori.getColumn(2));
-								MT_Vector3 scale(x.length(), y.length(), z.length());
-								if (!MT_fuzzyZero(scale[0]))
-									x /= scale[0];
-								if (!MT_fuzzyZero(scale[1]))
-									y /= scale[1];
-								if (!MT_fuzzyZero(scale[2]))
-									z /= scale[2];
+								MT_Vector3 localscale(x.length(), y.length(), z.length());
+								if (!MT_fuzzyZero(localscale[0]))
+									x /= localscale[0];
+								if (!MT_fuzzyZero(localscale[1]))
+									y /= localscale[1];
+								if (!MT_fuzzyZero(localscale[2]))
+									z /= localscale[2];
 								ori.setColumn(0, x);								
 								ori.setColumn(1, y);								
 								ori.setColumn(2, z);								
 								parentinversenode->SetLocalOrientation(ori);
-								parentinversenode->SetLocalScale(scale);
+								parentinversenode->SetLocalScale(localscale);
 								
 								parentinversenode->AddChild(gameobj->GetSGNode());
 							}
diff --git a/source/gameengine/Converter/BL_MeshDeformer.cpp b/source/gameengine/Converter/BL_MeshDeformer.cpp
index fa3b8185fe2..80112346c72 100644
--- a/source/gameengine/Converter/BL_MeshDeformer.cpp
+++ b/source/gameengine/Converter/BL_MeshDeformer.cpp
@@ -51,7 +51,6 @@
 bool BL_MeshDeformer::Apply(RAS_IPolyMaterial*)
 {
 	size_t i;
-	float *co;
 
 	// only apply once per frame if the mesh is actually modified
 	if(m_pMeshObject->MeshModified() &&
@@ -70,8 +69,7 @@ bool BL_MeshDeformer::Apply(RAS_IPolyMaterial*)
 				//	For each vertex
 				for(i=it.startvertex; i<it.endvertex; i++) {
 					RAS_TexVert& v = it.vertex[i];
-					co = m_bmesh->mvert[v.getOrigIndex()].co;
-					v.SetXYZ(MT_Point3(co));
+					v.SetXYZ(m_bmesh->mvert[v.getOrigIndex()].co);
 				}
 			}
 		}
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
index df1aed38ceb..f4e3e7e0ae8 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
@@ -484,8 +484,8 @@ PyAttributeDef BL_ShapeActionActuator::Attributes[] = {
 };
 
 
-PyObject* BL_ShapeActionActuator::_getattr(const STR_String& attr) {
-	if (attr == "action")
+PyObject* BL_ShapeActionActuator::_getattr(const char *attr) {
+	if (!strcmp(attr, "action"))
 		return PyString_FromString(m_action->id.name+2);
 	PyObject* object = _getattr_self(Attributes, this, attr);
 	if (object != NULL)
@@ -493,8 +493,8 @@ PyObject* BL_ShapeActionActuator::_getattr(const STR_String& attr) {
 	_getattr_up(SCA_IActuator);
 }
 
-int BL_ShapeActionActuator::_setattr(const STR_String& attr, PyObject* value) {
-	if (attr == "action")
+int BL_ShapeActionActuator::_setattr(const char *attr, PyObject* value) {
+	if (!strcmp(attr, "action"))
 	{
 		if (!PyString_Check(value))
 		{
@@ -911,6 +911,6 @@ PyObject* BL_ShapeActionActuator::PySetType(PyObject* self,
 		printf("Invalid type for action actuator: %d\n", typeArg); /* error */
     }
 	
-    Py_Return;
+    Py_RETURN_NONE;
 }
 
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.h b/source/gameengine/Converter/BL_ShapeActionActuator.h
index b521c0d98a6..7f2431bcfa5 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.h
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.h
@@ -103,8 +103,8 @@ public:
 	KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetType);
 	KX_PYMETHOD_DOC(BL_ShapeActionActuator,SetType);
 
-	virtual PyObject* _getattr(const STR_String& attr);
-	virtual int _setattr(const STR_String& attr, PyObject* value);
+	virtual PyObject* _getattr(const char *attr);
+	virtual int _setattr(const char *attr, PyObject* value);
 
 	static int CheckBlendTime(void *self, const PyAttributeDef*)
 	{
@@ -169,8 +169,8 @@ protected:
 	short	m_playtype;
 	short	m_priority;
 	struct bAction *m_action;
-	STR_String	m_propname;
 	STR_String	m_framepropname;
+	STR_String	m_propname;
 	vector<float> m_blendshape;
 };
 
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 7b68dbda176..7daca6c32fe 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -321,7 +321,7 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename,
 				SYS_SystemHandle syshandle = SYS_GetSystem(); /*unused*/
 				int visualizePhysics = SYS_GetCommandLineInt(syshandle,"show_physics",0);
 				if (visualizePhysics)
-					ccdPhysEnv->setDebugMode(btIDebugDraw::DBG_DrawWireframe|btIDebugDraw::DBG_DrawAabb|btIDebugDraw::DBG_DrawContactPoints|btIDebugDraw::DBG_DrawText);
+					ccdPhysEnv->setDebugMode(btIDebugDraw::DBG_DrawWireframe|btIDebugDraw::DBG_DrawAabb|btIDebugDraw::DBG_DrawContactPoints|btIDebugDraw::DBG_DrawText|btIDebugDraw::DBG_DrawConstraintLimits|btIDebugDraw::DBG_DrawConstraints);
 		
 				//todo: get a button in blender ?
 				//disable / enable debug drawing (contact points, aabb's etc)	
@@ -663,7 +663,7 @@ extern "C"
 	Ipo *add_ipo( char *name, int idcode );
 	//XXX char *getIpoCurveName( IpoCurve * icu );
 	//XXX struct IpoCurve *verify_ipocurve(struct ID *, short, char *, char *, char *, int);
-	void testhandles_ipocurve(struct IpoCurve *icu);
+	//XXX void testhandles_ipocurve(struct IpoCurve *icu);
 	void insert_vert_icu(struct IpoCurve *, float, float, short);
 	void Mat3ToEul(float tmat[][3], float *eul);
 }
@@ -751,7 +751,7 @@ void	KX_BlenderSceneConverter::ResetPhysicsObjectsAnimationIpo(bool clearIpo)
 							}
 					  	}
 					} else
-					{	ipo = add_ipo(blenderObject->id.name+2, ID_OB);
+					{	ipo = NULL; // XXX add_ipo(blenderObject->id.name+2, ID_OB);
 						blenderObject->ipo = ipo;
 
 					}
@@ -907,7 +907,7 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 							float curVal = position.x();
 							//XXX insert_vert_icu(icu1, frameNumber, curVal, 0);
 #ifdef TEST_HANDLES_GAME2IPO
-							testhandles_ipocurve(icu1);
+							//XXX testhandles_ipocurve(icu1);
 #endif
 						}
 						icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocY");
@@ -917,7 +917,7 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 							//XXX insert_vert_icu(icu1, frameNumber, curVal, 0);
 #ifdef TEST_HANDLES_GAME2IPO
 
-							testhandles_ipocurve(icu1);
+							//XXX testhandles_ipocurve(icu1);
 #endif
 						}
 						icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocZ");
@@ -926,7 +926,7 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 							float curVal = position.z();
 							//XXX insert_vert_icu(icu1, frameNumber, curVal, 0);
 #ifdef TEST_HANDLES_GAME2IPO
-							testhandles_ipocurve(icu1);
+							//XXX testhandles_ipocurve(icu1);
 #endif
 						}
 						icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotX");
@@ -936,7 +936,7 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 							//XXX insert_vert_icu(icu1, frameNumber, curVal, 0);
 #ifdef TEST_HANDLES_GAME2IPO
 
-							testhandles_ipocurve(icu1);
+							//XXX testhandles_ipocurve(icu1);
 #endif
 						}
 						icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotY");
@@ -946,7 +946,7 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 							//XXX insert_vert_icu(icu1, frameNumber, curVal, 0);
 #ifdef TEST_HANDLES_GAME2IPO
 
-							testhandles_ipocurve(icu1);
+							//XXX testhandles_ipocurve(icu1);
 #endif
 						}
 						icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotZ");
@@ -956,7 +956,7 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 							//XXX insert_vert_icu(icu1, frameNumber, curVal, 0);
 #ifdef TEST_HANDLES_GAME2IPO
 							
-							testhandles_ipocurve(icu1);
+							//XXX testhandles_ipocurve(icu1);
 #endif
 
 						}
@@ -1060,32 +1060,32 @@ void	KX_BlenderSceneConverter::TestHandlesPhysicsObjectToAnimationIpo()
 						icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocX");
 						if (icu1)
 						{
-							testhandles_ipocurve(icu1);
+							//XXX testhandles_ipocurve(icu1);
 						}
 						icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocY");
 						if (icu1)
 						{
-							testhandles_ipocurve(icu1);
+							//XXX testhandles_ipocurve(icu1);
 						}
 						icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocZ");
 						if (icu1)
 						{
-							testhandles_ipocurve(icu1);
+							//XXX testhandles_ipocurve(icu1);
 						}
 						icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotX");
 						if (icu1)
 						{
-							testhandles_ipocurve(icu1);
+							//XXX testhandles_ipocurve(icu1);
 						}
 						icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotY");
 						if (icu1)
 						{
-							testhandles_ipocurve(icu1);
+							//XXX testhandles_ipocurve(icu1);
 						}
 						icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotZ");
 						if (icu1)
 						{
-							testhandles_ipocurve(icu1);
+							//XXX testhandles_ipocurve(icu1);
 						}
 
 					}
diff --git a/source/gameengine/Converter/KX_ConvertControllers.cpp b/source/gameengine/Converter/KX_ConvertControllers.cpp
index da490b4ee85..fb100b0a68b 100644
--- a/source/gameengine/Converter/KX_ConvertControllers.cpp
+++ b/source/gameengine/Converter/KX_ConvertControllers.cpp
@@ -200,6 +200,13 @@ void BL_ConvertControllers(
 			gameobj->AddController(gamecontroller);
 			
 			converter->RegisterGameController(gamecontroller, bcontr);
+			
+			if (bcontr->type==CONT_PYTHON) {
+				/* not strictly needed but gives syntax errors early on and
+				 * gives more pradictable performance for larger scripts */
+				(static_cast<SCA_PythonController*>(gamecontroller))->Compile();
+			}
+			
 			//done with gamecontroller
 			gamecontroller->Release();
 		}
diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp
index b7b47b3b39f..c91197b72a6 100644
--- a/source/gameengine/Converter/KX_ConvertSensors.cpp
+++ b/source/gameengine/Converter/KX_ConvertSensors.cpp
@@ -317,12 +317,12 @@ void BL_ConvertSensors(struct Object* blenderobject,
 				{
 					// collision sensor can sense both materials and properties. 
 					
-					bool bFindMaterial = false;
+					bool bFindMaterial = false, bTouchPulse = false;
 					
 					bCollisionSensor* blendertouchsensor = (bCollisionSensor*)sens->data;
 					
-					bFindMaterial = (blendertouchsensor->mode 
-						& SENS_COLLISION_MATERIAL);
+					bFindMaterial = (blendertouchsensor->mode & SENS_COLLISION_MATERIAL);
+					bTouchPulse = (blendertouchsensor->mode & SENS_COLLISION_PULSE);
 					
 					
 					STR_String touchPropOrMatName = ( bFindMaterial ? 
@@ -335,6 +335,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
 						gamesensor = new KX_TouchSensor(eventmgr,
 							gameobj,
 							bFindMaterial,
+							bTouchPulse,
 							touchPropOrMatName);
 					}
 					
@@ -360,6 +361,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
 						gamesensor = new KX_TouchSensor(eventmgr,
 							gameobj,
 							bFindMaterial,
+							false,
 							touchpropertyname);
 					}
 				}
diff --git a/source/gameengine/Converter/KX_IpoConvert.cpp b/source/gameengine/Converter/KX_IpoConvert.cpp
index ce004fa0504..f19390db8a9 100644
--- a/source/gameengine/Converter/KX_IpoConvert.cpp
+++ b/source/gameengine/Converter/KX_IpoConvert.cpp
@@ -311,67 +311,67 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 		}
 		
 		{
-			KX_ObColorIpoSGController* ipocontr=NULL;
+			KX_ObColorIpoSGController* ipocontr_obcol=NULL;
 
 			ipo = ipoList->GetScalarInterpolator(OB_COL_R);
 			if (ipo)
 			{
-				if (!ipocontr)
+				if (!ipocontr_obcol)
 				{
-					ipocontr = new KX_ObColorIpoSGController();
-					gameobj->GetSGNode()->AddSGController(ipocontr);
-					ipocontr->SetObject(gameobj->GetSGNode());
+					ipocontr_obcol = new KX_ObColorIpoSGController();
+					gameobj->GetSGNode()->AddSGController(ipocontr_obcol);
+					ipocontr_obcol->SetObject(gameobj->GetSGNode());
 				}
 				KX_IInterpolator *interpolator =
 				new KX_ScalarInterpolator(
-					&ipocontr->m_rgba[0],
+					&ipocontr_obcol->m_rgba[0],
 					ipo);
-				ipocontr->AddInterpolator(interpolator);
+				ipocontr_obcol->AddInterpolator(interpolator);
 			}
 			ipo = ipoList->GetScalarInterpolator(OB_COL_G);
 			if (ipo)
 			{
-				if (!ipocontr)
+				if (!ipocontr_obcol)
 				{
-					ipocontr = new KX_ObColorIpoSGController();
-					gameobj->GetSGNode()->AddSGController(ipocontr);
-					ipocontr->SetObject(gameobj->GetSGNode());
+					ipocontr_obcol = new KX_ObColorIpoSGController();
+					gameobj->GetSGNode()->AddSGController(ipocontr_obcol);
+					ipocontr_obcol->SetObject(gameobj->GetSGNode());
 				}
 				KX_IInterpolator *interpolator =
 				new KX_ScalarInterpolator(
-					&ipocontr->m_rgba[1],
+					&ipocontr_obcol->m_rgba[1],
 					ipo);
-				ipocontr->AddInterpolator(interpolator);
+				ipocontr_obcol->AddInterpolator(interpolator);
 			}
 			ipo = ipoList->GetScalarInterpolator(OB_COL_B);
 			if (ipo)
 			{
-				if (!ipocontr)
+				if (!ipocontr_obcol)
 				{
-					ipocontr = new KX_ObColorIpoSGController();
-					gameobj->GetSGNode()->AddSGController(ipocontr);
-					ipocontr->SetObject(gameobj->GetSGNode());
+					ipocontr_obcol = new KX_ObColorIpoSGController();
+					gameobj->GetSGNode()->AddSGController(ipocontr_obcol);
+					ipocontr_obcol->SetObject(gameobj->GetSGNode());
 				}
 				KX_IInterpolator *interpolator =
 				new KX_ScalarInterpolator(
-					&ipocontr->m_rgba[2],
+					&ipocontr_obcol->m_rgba[2],
 					ipo);
-				ipocontr->AddInterpolator(interpolator);
+				ipocontr_obcol->AddInterpolator(interpolator);
 			}
 			ipo = ipoList->GetScalarInterpolator(OB_COL_A);
 			if (ipo)
 			{
-				if (!ipocontr)
+				if (!ipocontr_obcol)
 				{
-					ipocontr = new KX_ObColorIpoSGController();
-					gameobj->GetSGNode()->AddSGController(ipocontr);
-					ipocontr->SetObject(gameobj->GetSGNode());
+					ipocontr_obcol = new KX_ObColorIpoSGController();
+					gameobj->GetSGNode()->AddSGController(ipocontr_obcol);
+					ipocontr_obcol->SetObject(gameobj->GetSGNode());
 				}
 				KX_IInterpolator *interpolator =
 				new KX_ScalarInterpolator(
-					&ipocontr->m_rgba[3],
+					&ipocontr_obcol->m_rgba[3],
 					ipo);
-				ipocontr->AddInterpolator(interpolator);
+				ipocontr_obcol->AddInterpolator(interpolator);
 			}
 		}
 
diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript
index 5c2ab49a04c..98b7c71bad2 100644
--- a/source/gameengine/Converter/SConscript
+++ b/source/gameengine/Converter/SConscript
@@ -2,6 +2,7 @@
 Import ('env')
 
 sources = env.Glob('*.cpp')
+defs = []
 
 incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc'
 incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont'
@@ -14,13 +15,17 @@ incs += ' #source/blender/editors/include #source/blender/makesdna #source/gamee
 incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #source/gameengine/GameLogic'
 incs += ' #source/gameengine/Expressions #source/gameengine/Network #source/gameengine/SceneGraph'
 incs += ' #source/gameengine/Physics/common #source/gameengine/Physics/Bullet #source/gameengine/Physics/BlOde'
-incs += ' #source/gameengine/Physics/Dummy #source/gameengine/Physics/Sumo'
-incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork'
+incs += ' #source/gameengine/Physics/Dummy'
+incs += ' #source/gameengine/Network/LoopBackNetwork'
 incs += ' #source/blender/misc #source/blender/blenloader #source/blender/gpu'
 incs += ' #source/blender/windowmanager'
 
+if env['WITH_BF_SOLID']:
+	incs += ' #source/gameengine/Physics/Sumo #source/gameengine/Physics/Sumo/Fuzzics/include'
+	incs += ' ' + env['BF_SOLID_INC']
+	defs.append('USE_SUMO_SOLID')
+
 incs += ' ' + env['BF_PYTHON_INC']
-incs += ' ' + env['BF_SOLID_INC']
 incs += ' ' + env['BF_BULLET_INC']
 
-env.BlenderLib ( 'bf_converter', sources, Split(incs), [], libtype=['core','player'], priority=[305,50] )
+env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,50] )