Merge of trunk into blender 2.5:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416

Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
  later added in trunk also, but reverted partially, specifically revision
  16683. I have left out this reversion in the 2.5 branch since I think it is
  needed there.
  http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
  for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
  -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
  differently. Since this is changed so much, and I don't think those fixes
  would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
  initialized when running with -P. The code that initializes the screen there
  I had to disable, that can't work in 2.5 anymore but left it commented as a
  reminder.

Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.

Still to be done:
* Go over files and functions that were moved to a different location but could
  still use changes that were done in trunk.

1 files changed, 67 insertions, 37 deletions

diff --git a/source/gameengine/Converter/KX_IpoConvert.cpp b/source/gameengine/Converter/KX_IpoConvert.cpp
index 4d1fb7323f3..ce004fa0504 100644
--- a/source/gameengine/Converter/KX_IpoConvert.cpp
+++ b/source/gameengine/Converter/KX_IpoConvert.cpp
@@ -36,6 +36,7 @@
 #pragma warning (disable:4786)
 #endif
 
+#include "BKE_material.h" /* give_current_material */
 
 #include "KX_GameObject.h"
 #include "KX_IpoConvert.h"
@@ -68,6 +69,8 @@
 
 #include "SG_Node.h"
 
+#include "STR_HashedString.h"
+
 static BL_InterpolatorList *GetIpoList(struct Ipo *for_ipo, KX_BlenderSceneConverter *converter) {
 	BL_InterpolatorList *ipoList= converter->FindInterpolatorList(for_ipo);
 
@@ -97,9 +100,9 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 
 		ipocontr->GetIPOTransform().SetPosition(
 			MT_Point3(
-			blenderobject->loc[0]+blenderobject->dloc[0],
-			blenderobject->loc[1]+blenderobject->dloc[1],
-			blenderobject->loc[2]+blenderobject->dloc[2]
+			blenderobject->loc[0]/*+blenderobject->dloc[0]*/,
+			blenderobject->loc[1]/*+blenderobject->dloc[1]*/,
+			blenderobject->loc[2]/*+blenderobject->dloc[2]*/
 			)
 		);
 		ipocontr->GetIPOTransform().SetEulerAngles(
@@ -131,7 +134,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetPosition()[0]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyPosition(true);
+			ipocontr->SetIPOChannelActive(OB_LOC_X, true);
 	
 		}
 		
@@ -142,7 +145,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetPosition()[1]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyPosition(true);
+			ipocontr->SetIPOChannelActive(OB_LOC_Y, true);
 		}
 		
 		ipo = ipoList->GetScalarInterpolator(OB_LOC_Z);
@@ -152,7 +155,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetPosition()[2]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyPosition(true);
+			ipocontr->SetIPOChannelActive(OB_LOC_Z, true);
 		}
 		
 		// Master the art of cut & paste programming...
@@ -164,7 +167,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetDeltaPosition()[0]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyPosition(true);
+			ipocontr->SetIPOChannelActive(OB_DLOC_X, true);
 		}
 		
 		ipo = ipoList->GetScalarInterpolator(OB_DLOC_Y);
@@ -174,7 +177,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetDeltaPosition()[1]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyPosition(true);
+			ipocontr->SetIPOChannelActive(OB_DLOC_Y, true);
 		}
 		
 		ipo = ipoList->GetScalarInterpolator(OB_DLOC_Z);
@@ -184,7 +187,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetDeltaPosition()[2]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyPosition(true);
+			ipocontr->SetIPOChannelActive(OB_DLOC_Z, true);
 		}
 		
 		// Explore the finesse of reuse and slight modification
@@ -196,7 +199,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetEulerAngles()[0]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyOrientation(true);
+			ipocontr->SetIPOChannelActive(OB_ROT_X, true);
 		}
 		ipo = ipoList->GetScalarInterpolator(OB_ROT_Y);
 		if (ipo) {
@@ -205,7 +208,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetEulerAngles()[1]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyOrientation(true);
+			ipocontr->SetIPOChannelActive(OB_ROT_Y, true);
 		}
 		ipo = ipoList->GetScalarInterpolator(OB_ROT_Z);
 		if (ipo) {
@@ -214,7 +217,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetEulerAngles()[2]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyOrientation(true);
+			ipocontr->SetIPOChannelActive(OB_ROT_Z, true);
 		}
 
 		// Hmmm, the need for a macro comes to mind... 
@@ -226,7 +229,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetDeltaEulerAngles()[0]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyOrientation(true);
+			ipocontr->SetIPOChannelActive(OB_DROT_X, true);
 		}
 		ipo = ipoList->GetScalarInterpolator(OB_DROT_Y);
 		if (ipo) {
@@ -235,7 +238,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetDeltaEulerAngles()[1]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyOrientation(true);
+			ipocontr->SetIPOChannelActive(OB_DROT_Y, true);
 		}
 		ipo = ipoList->GetScalarInterpolator(OB_DROT_Z);
 		if (ipo) {
@@ -244,7 +247,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetDeltaEulerAngles()[2]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyOrientation(true);
+			ipocontr->SetIPOChannelActive(OB_DROT_Z, true);
 		}
 
 		// Hang on, almost there... 
@@ -256,7 +259,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetScaling()[0]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyScaling(true);
+			ipocontr->SetIPOChannelActive(OB_SIZE_X, true);
 		}
 		ipo = ipoList->GetScalarInterpolator(OB_SIZE_Y);
 		if (ipo) {
@@ -265,7 +268,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetScaling()[1]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyScaling(true);
+			ipocontr->SetIPOChannelActive(OB_SIZE_Y, true);
 		}
 		ipo = ipoList->GetScalarInterpolator(OB_SIZE_Z);
 		if (ipo) {
@@ -274,7 +277,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetScaling()[2]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyScaling(true);
+			ipocontr->SetIPOChannelActive(OB_SIZE_Z, true);
 		}
 
 		// The last few... 
@@ -286,7 +289,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetDeltaScaling()[0]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyScaling(true);
+			ipocontr->SetIPOChannelActive(OB_DSIZE_X, true);
 		}
 		ipo = ipoList->GetScalarInterpolator(OB_DSIZE_Y);
 		if (ipo) {
@@ -295,7 +298,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetDeltaScaling()[1]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyScaling(true);
+			ipocontr->SetIPOChannelActive(OB_DSIZE_Y, true);
 		}
 		ipo = ipoList->GetScalarInterpolator(OB_DSIZE_Z);
 		if (ipo) {
@@ -304,7 +307,7 @@ void BL_ConvertIpos(struct Object* blenderobject,KX_GameObject* gameobj,KX_Blend
 					&(ipocontr->GetIPOTransform().GetDeltaScaling()[2]),
 					ipo);
 			ipocontr->AddInterpolator(interpolator);
-			ipocontr->SetModifyScaling(true);
+			ipocontr->SetIPOChannelActive(OB_DSIZE_Z, true);
 		}
 		
 		{
@@ -560,16 +563,15 @@ void BL_ConvertWorldIpos(struct World* blenderworld,KX_BlenderSceneConverter *co
 	}
 }
 
-
-void BL_ConvertMaterialIpos(
-	Material* blendermaterial, 
+static void ConvertMaterialIpos(
+	Material* blendermaterial,
+	dword matname_hash,
 	KX_GameObject* gameobj,  
 	KX_BlenderSceneConverter *converter
 	)
 {
 	if (blendermaterial->ipo) {
-	
-		KX_MaterialIpoController* ipocontr = new KX_MaterialIpoController();
+		KX_MaterialIpoController* ipocontr = new KX_MaterialIpoController(matname_hash);
 		gameobj->GetSGNode()->AddSGController(ipocontr);
 		ipocontr->SetObject(gameobj->GetSGNode());
 		
@@ -596,7 +598,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_COL_R);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -610,7 +612,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_COL_G);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -624,7 +626,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_COL_B);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -638,7 +640,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_ALPHA);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -653,7 +655,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_SPEC_R );
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -667,7 +669,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_SPEC_G);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -681,7 +683,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_SPEC_B);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -696,7 +698,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_HARD);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -710,7 +712,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_SPEC);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -725,7 +727,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_REF);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -739,7 +741,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_EMIT);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -752,3 +754,31 @@ void BL_ConvertMaterialIpos(
 	}		
 }
 
+void BL_ConvertMaterialIpos(
+	struct Object* blenderobject,
+	KX_GameObject* gameobj,  
+	KX_BlenderSceneConverter *converter
+	)
+{
+	if (blenderobject->totcol==1)
+	{
+		Material *mat = give_current_material(blenderobject, 1);
+		// if there is only one material attached to the mesh then set material_index in BL_ConvertMaterialIpos to NULL
+		// --> this makes the UpdateMaterialData function in KX_GameObject.cpp use the old hack of using SetObjectColor
+		// because this yields a better performance as not all the vertex colors need to be edited
+		if(mat) ConvertMaterialIpos(mat, 0, gameobj, converter);
+	}
+	else
+	{
+		for (int material_index=1; material_index <= blenderobject->totcol; material_index++)
+		{
+			Material *mat = give_current_material(blenderobject, material_index);
+			STR_HashedString matname;
+			if(mat) {
+				matname= mat->id.name;
+				ConvertMaterialIpos(mat, matname.hash(), gameobj, converter);
+			}
+		}
+	}
+}
+