Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2005-10-10 22:57:55 +0400
committerTon Roosendaal <ton@blender.org>2005-10-10 22:57:55 +0400
commit28f0eeaf61cbc756f08c66073efe3eeff098621f (patch)
tree12997cd1792163e56be84ff93aa505f41cd77bc4 /source/gameengine/Converter
parentbbb2ab39a07d130a1369c734229b17b3670d7446 (diff)
Ack! Recently the get_ipocurve was added in the game engine, for baking
physics. This creates very bad dependencies... tsk! comments indicate it though; //quick hack //todo, before 2.38/2.40 release, Erwin Hrms... :)
Diffstat (limited to 'source/gameengine/Converter')
-rw-r--r--source/gameengine/Converter/KX_BlenderSceneConverter.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 901c37daa07..6ba96e3a211 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -509,7 +509,7 @@ extern "C"
{
Ipo *add_ipo( char *name, int idcode );
char *getIpoCurveName( IpoCurve * icu );
- struct IpoCurve *get_ipocurve(struct ID *from, short type, int adrcode, struct Ipo *useipo);
+ struct IpoCurve *verify_ipocurve(struct ID *, short, char *, char *, int);
void testhandles_ipocurve(struct IpoCurve *icu);
void Mat3ToEul(float tmat[][3], float *eul);
@@ -672,27 +672,27 @@ void KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
IpoCurve *icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocX");
if (!icu1)
- icu1 = get_ipocurve( NULL, ipo->blocktype, OB_LOC_X, ipo );
+ icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_LOC_X);
icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocY");
if (!icu1)
- icu1 = get_ipocurve( NULL, ipo->blocktype, OB_LOC_Y, ipo );
+ icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_LOC_Y);
icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"LocZ");
if (!icu1)
- icu1 = get_ipocurve( NULL, ipo->blocktype, OB_LOC_Z, ipo );
+ icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_LOC_Z);
icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotX");
if (!icu1)
- icu1 = get_ipocurve( NULL, ipo->blocktype, OB_ROT_X, ipo );
+ icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_ROT_X);
icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotY");
if (!icu1)
- icu1 = get_ipocurve( NULL, ipo->blocktype, OB_ROT_Y, ipo );
+ icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_ROT_Y);
icu1 = findIpoCurve((IpoCurve *)ipo->curve.first,"RotZ");
if (!icu1)
- icu1 = get_ipocurve( NULL, ipo->blocktype, OB_ROT_Z, ipo );
+ icu1 = verify_ipocurve(&blenderObject->id, ipo->blocktype, NULL, NULL, OB_ROT_Z);
@@ -862,7 +862,7 @@ void KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
( PyExc_NameError, "curve name was invalid" );
/* ask blender to create the new ipo curve */
- icu = get_ipocurve( NULL, ipo->blocktype, param, self->ipo );
+ icu = verify_ipocurve( NULL, ipo->blocktype, NULL, NULL, param);
if( icu == 0 ) /* could not create curve */
return EXPP_ReturnPyObjError