svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / gameengine / Converter / BL_BlenderDataConversion.cpp
index b8e53c87fa9b4e104af9e49a67cc45f8a668b712..cedd05cc32bb27ad4447e7f643d5612151ba6812 100644 (file)
@@ -1911,11 +1911,11 @@ void RBJconstraints(Object *ob)//not used
 
 KX_IPhysicsController* getPhId(CListValue* sumolist,STR_String busc){//not used
 
-    for (int j=0;j<sumolist->GetCount();j++)
+       for (int j=0;j<sumolist->GetCount();j++)
        {
-           KX_GameObject* gameobje = (KX_GameObject*) sumolist->GetValue(j);
-           if (gameobje->GetName()==busc)
-            return gameobje->GetPhysicsController();
+               KX_GameObject* gameobje = (KX_GameObject*) sumolist->GetValue(j);
+               if (gameobje->GetName()==busc)
+                       return gameobje->GetPhysicsController();
        }
 
        return 0;
@@ -1924,11 +1924,11 @@ KX_IPhysicsController* getPhId(CListValue* sumolist,STR_String busc){//not used
 
 KX_GameObject* getGameOb(STR_String busc,CListValue* sumolist){
 
-    for (int j=0;j<sumolist->GetCount();j++)
+       for (int j=0;j<sumolist->GetCount();j++)
        {
-           KX_GameObject* gameobje = (KX_GameObject*) sumolist->GetValue(j);
-           if (gameobje->GetName()==busc)
-            return gameobje;
+               KX_GameObject* gameobje = (KX_GameObject*) sumolist->GetValue(j);
+               if (gameobje->GetName()==busc)
+                       return gameobje;
        }
        
        return 0;
@@ -2629,7 +2629,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
                                                {
                                                        PHY_IPhysicsController* physctrl = (PHY_IPhysicsController*) gameobj->GetPhysicsController()->GetUserData();
                                                        //we need to pass a full constraint frame, not just axis
-                                   
+
                                                        //localConstraintFrameBasis
                                                        MT_Matrix3x3 localCFrame(MT_Vector3(dat->axX,dat->axY,dat->axZ));
                                                        MT_Vector3 axis0 = localCFrame.getColumn(0);