diff options
Diffstat (limited to 'source/gameengine/Ketsji/KX_GameObject.cpp')
-rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index d7a94f0601c..1dbcf14af89 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -481,11 +481,6 @@ void KX_GameObject::UpdateActionManager(float curtime) GetActionManager()->Update(curtime); } -void KX_GameObject::UpdateActionIPOs() -{ - GetActionManager()->UpdateIPOs(); -} - float KX_GameObject::GetActionFrame(short layer) { return GetActionManager()->GetActionFrame(layer); @@ -949,6 +944,9 @@ void KX_GameObject::InitIPO(bool ipo_as_force, void KX_GameObject::UpdateIPO(float curframetime, bool recurse) { + /* This function shouldn't call BL_Action::Update, not even indirectly, + * as it will cause deadlock due to the lock in BL_Action::Update. */ + // just the 'normal' update procedure. GetSGNode()->SetSimulatedTime(curframetime,recurse); GetSGNode()->UpdateWorldData(curframetime); |