[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38880] trunk/blender/source/gameengine/ Ketsji/KX_PyConstraintBinding.cpp: reverting part of #38876 ( whitespace edits)

Dalai Felinto dfelinto at gmail.com
Sun Jul 31 13:21:48 CEST 2011


Revision: 38880
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38880
Author:   dfelinto
Date:     2011-07-31 11:21:48 +0000 (Sun, 31 Jul 2011)
Log Message:
-----------
reverting part of #38876 (whitespace edits)
the new if/else nesting introduced in the previous commit makes no sense.
(since I was here I add a comment for extrainfo and did some small cleanup)

Modified Paths:
--------------
    trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp

Modified: trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp	2011-07-31 11:12:38 UTC (rev 38879)
+++ trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp	2011-07-31 11:21:48 UTC (rev 38880)
@@ -429,46 +429,46 @@
 		success = PyArg_ParseTuple(args,"lli",&physicsid,&physicsid2,&constrainttype);
 #endif
 	}
-	else {
-		if (len ==6) {
+	else if (len == 6)
+	{
 #if defined(_WIN64)
-			success = PyArg_ParseTuple(args,"LLifff",&physicsid,&physicsid2,&constrainttype,
-			                           &pivotX,&pivotY,&pivotZ);
+		success = PyArg_ParseTuple(args,"LLifff",&physicsid,&physicsid2,&constrainttype,
+		                           &pivotX,&pivotY,&pivotZ);
 #else
-			success = PyArg_ParseTuple(args,"llifff",&physicsid,&physicsid2,&constrainttype,
-			                           &pivotX,&pivotY,&pivotZ);
+		success = PyArg_ParseTuple(args,"llifff",&physicsid,&physicsid2,&constrainttype,
+		                           &pivotX,&pivotY,&pivotZ);
 #endif	
-		}
-		else if (len == 9)
-		{
+	}
+	else if (len == 9)
+	{
 #if defined(_WIN64)
-			success = PyArg_ParseTuple(args,"LLiffffff",&physicsid,&physicsid2,&constrainttype,
-			                           &pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ);
+		success = PyArg_ParseTuple(args,"LLiffffff",&physicsid,&physicsid2,&constrainttype,
+		                           &pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ);
 #else
-			success = PyArg_ParseTuple(args,"lliffffff",&physicsid,&physicsid2,&constrainttype,
-			                           &pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ);
+		success = PyArg_ParseTuple(args,"lliffffff",&physicsid,&physicsid2,&constrainttype,
+		                           &pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ);
 #endif
-
-		}
-		else if (len == 10)
-		{
+	}
+	else if (len == 10)
+	{
 #if defined(_WIN64)
-			success = PyArg_ParseTuple(args,"LLiffffffi",&physicsid,&physicsid2,&constrainttype,
-			                           &pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ,&flag);
+		success = PyArg_ParseTuple(args,"LLiffffffi",&physicsid,&physicsid2,&constrainttype,
+		                           &pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ,&flag);
 #else
-			success = PyArg_ParseTuple(args,"lliffffffi",&physicsid,&physicsid2,&constrainttype,
-			                           &pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ,&flag);
+		success = PyArg_ParseTuple(args,"lliffffffi",&physicsid,&physicsid2,&constrainttype,
+		                           &pivotX,&pivotY,&pivotZ,&axisX,&axisY,&axisZ,&flag);
 #endif
-		}
-		else if (len==4)
-		{
+	}
+
+	/* XXX extrainfo seems to be nothing implemented. right now it works as a pivot with [X,0,0] */
+	else if (len == 4)
+	{
 #if defined(_WIN64)
-			success = PyArg_ParseTuple(args,"LLii",&physicsid,&physicsid2,&constrainttype,&extrainfo);
+		success = PyArg_ParseTuple(args,"LLii",&physicsid,&physicsid2,&constrainttype,&extrainfo);
 #else
-			success = PyArg_ParseTuple(args,"llii",&physicsid,&physicsid2,&constrainttype,&extrainfo);
+		success = PyArg_ParseTuple(args,"llii",&physicsid,&physicsid2,&constrainttype,&extrainfo);
 #endif
-			pivotX=extrainfo;
-		}
+		pivotX=extrainfo;
 	}
 
 	if (success)




More information about the Bf-blender-cvs mailing list