diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-30 13:31:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-30 13:31:11 +0400 |
| commit | 9e5b28cd42a3cf87ac76e3b27b52dce08071d244 (patch) | |
| tree | eb14ff117faf3f6c524ea0a09389da313044d105 /source/gameengine | |
| parent | 274080025d315dc08f9291bddc6d4235ed0fc8e0 (diff) | |
| parent | c9edbab08a4854ad6e79abdfaaee65e0f9301ac0 (diff) | |
svn merge ^/trunk/blender -r42261:42290
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index 7699e86f19f..2f5125a63dd 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -765,7 +765,7 @@ void KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber) { KX_GameObject* gameObj = (KX_GameObject*)parentList->GetValue(g); Object* blenderObject = gameObj->GetBlenderObject(); - if (blenderObject && blenderObject->parent==NULL && gameObj->GetPhysicsController() != NULL) + if (blenderObject && blenderObject->parent==NULL && gameObj->IsDynamic()) { //KX_IPhysicsController* physCtrl = gameObj->GetPhysicsController(); |