branches/blender-2.47

Merge from trunk:
	Revision: 15756
	Revision: 15758
	Revision: 15766
	Revision: 15768
	Revision: 15769
	Revision: 15772 (Only constraint mesh-targets)
	Revision: 15775
	Revision: 15776
	Revision: 15787
	Revision: 15803
	Revision: 15805

2 files changed, 24 insertions, 7 deletions

diff --git a/source/gameengine/Ketsji/KX_PyMath.h b/source/gameengine/Ketsji/KX_PyMath.h
index e1715c9275f..4e383e9b3d4 100644
--- a/source/gameengine/Ketsji/KX_PyMath.h
+++ b/source/gameengine/Ketsji/KX_PyMath.h
@@ -84,7 +84,10 @@ bool PyMatTo(PyObject* pymat, T& mat)
 		}
 	} else 
 		noerror = false;
-	 
+	
+	if (noerror==false)
+		PyErr_SetString(PyExc_TypeError, "could not be converted to a matrix (sequence of sequences)");
+	
 	return noerror;
 }
 
@@ -97,9 +100,13 @@ bool PyVecTo(PyObject* pyval, T& vec)
 	if (PySequence_Check(pyval))
 	{
 		unsigned int numitems = PySequence_Size(pyval);
-		if (numitems != Size(vec))
+		if (numitems != Size(vec)) {
+			char err[128];
+			sprintf(err, "error setting vector, %d args, should be %d", numitems, Size(vec));
+			PyErr_SetString(PyExc_AttributeError, err);
 			return false;
-			
+		}
+		
 		for (unsigned int x = 0; x < numitems; x++)
 		{
 			PyObject *item = PySequence_GetItem(pyval, x); /* new ref */
@@ -107,7 +114,17 @@ bool PyVecTo(PyObject* pyval, T& vec)
 			Py_DECREF(item);
 		}
 		
+		if (PyErr_Occurred()) {
+			PyErr_SetString(PyExc_AttributeError, "one or more of the items in the sequence was not a float");
+			return false;
+		}
+		
 		return true;
+	} else
+	{
+		char err[128];
+		sprintf(err, "not a sequence type, expected a sequence of numbers size %d", Size(vec));
+		PyErr_SetString(PyExc_AttributeError, err);
 	}
 	
 	return false;
diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.cpp b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
index b9792303565..5eee55cb4b7 100644
--- a/source/gameengine/Ketsji/KX_TrackToActuator.cpp
+++ b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
@@ -146,19 +146,19 @@ void compatible_eulFast(float *eul, float *oldrot)
 {
 	float dx, dy, dz;
 	
-	/* verschillen van ong 360 graden corrigeren */
+	/* angular difference of 360 degrees */
 
 	dx= eul[0] - oldrot[0];
 	dy= eul[1] - oldrot[1];
 	dz= eul[2] - oldrot[2];
 
-	if( fabs(dx) > 5.1) {
+	if( fabs(dx) > MT_PI) {
 		if(dx > 0.0) eul[0] -= MT_2_PI; else eul[0]+= MT_2_PI;
 	}
-	if( fabs(dy) > 5.1) {
+	if( fabs(dy) > MT_PI) {
 		if(dy > 0.0) eul[1] -= MT_2_PI; else eul[1]+= MT_2_PI;
 	}
-	if( fabs(dz) > 5.1 ) {
+	if( fabs(dz) > MT_PI ) {
 		if(dz > 0.0) eul[2] -= MT_2_PI; else eul[2]+= MT_2_PI;
 	}
 }