svn merge -r 12691:12716 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / gameengine / Converter / KX_BlenderSceneConverter.cpp
index 01289113bf151d380b69bf2f10c56aed1f72b692..0da76e36e22b187a31b8917d69940dfe6b6c16b3 100644 (file)
@@ -553,7 +553,7 @@ extern "C"
 {
        Ipo *add_ipo( char *name, int idcode );
        char *getIpoCurveName( IpoCurve * icu );
-       struct IpoCurve *verify_ipocurve(struct ID *, short, char *, char *, int);
+       struct IpoCurve *verify_ipocurve(struct ID *, short, char *, char *, char *, int);
        void testhandles_ipocurve(struct IpoCurve *icu);
        void Mat3ToEul(float tmat[][3], float *eul);
 
@@ -766,27 +766,27 @@ void      KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 
                                        IpoCurve *icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocX");
                                        if (!icu1)
-                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_LOC_X);
+                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_X);
                                        
                                        icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocY");
                                        if (!icu1)
-                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_LOC_Y);
+                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_Y);
                                        
                                        icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocZ");
                                        if (!icu1)
-                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_LOC_Z);
+                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_Z);
 
                                        icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotX");
                                        if (!icu1)
-                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_ROT_X);
+                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_X);
 
                                        icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotY");
                                        if (!icu1)
-                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_ROT_Y);
+                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_Y);
 
                                        icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotZ");
                                        if (!icu1)
-                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_ROT_Z);
+                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_Z);
 
 
 
@@ -922,27 +922,27 @@ void      KX_BlenderSceneConverter::TestHandlesPhysicsObjectToAnimationIpo()
 
                                        IpoCurve *icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocX");
                                        if (!icu1)
-                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_LOC_X);
+                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_X);
                                        
                                        icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocY");
                                        if (!icu1)
-                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_LOC_Y);
+                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_Y);
                                        
                                        icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocZ");
                                        if (!icu1)
-                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_LOC_Z);
+                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_LOC_Z);
 
                                        icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotX");
                                        if (!icu1)
-                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_ROT_X);
+                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_X);
 
                                        icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotY");
                                        if (!icu1)
-                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_ROT_Y);
+                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_Y);
 
                                        icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotZ");
                                        if (!icu1)
-                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_ROT_Z);
+                                               icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, NULL, OB_ROT_Z);