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:
authorErwin Coumans <blender@erwincoumans.com>2005-08-22 22:31:19 +0400
committerErwin Coumans <blender@erwincoumans.com>2005-08-22 22:31:19 +0400
commit43b59afebb7b4887028786174978ab551e8cb9d2 (patch)
tree44df649fa62f5a54538575d9780b061b92dfc9d3 /source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
parent3b8e94ac6b10900825cf0c93aaa2e67d3f4d59a3 (diff)
more preparation for physics recording to ipo keyframes
Diffstat (limited to 'source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
index cedd689e85f..b5aea65cfe4 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
@@ -305,7 +305,7 @@ static void BL_RegisterSumoObject(
// need easy access, not via 'node' etc.
KX_SumoPhysicsController* physicscontroller = new KX_SumoPhysicsController(sumoScene,sumoObj,motionstate,isDynamic);
- gameobj->SetPhysicsController(physicscontroller);
+ gameobj->SetPhysicsController(physicscontroller,isDynamic);
if (!gameobj->getClientInfo())
@@ -1012,7 +1012,7 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj,
env->addCcdPhysicsController( physicscontroller);
- gameobj->SetPhysicsController(physicscontroller);
+ gameobj->SetPhysicsController(physicscontroller,dyna);
physicscontroller->setNewClientInfo(gameobj->getClientInfo());
bool isActor = objprop->m_isactor;
gameobj->getClientInfo()->m_type = (isActor ? KX_ClientObjectInfo::ACTOR : KX_ClientObjectInfo::STATIC);