diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-08-27 10:02:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-08-27 10:02:10 +0400 |
| commit | 6cccdf0cb2602b46e9c1e0a0a7f40853626735cf (patch) | |
| tree | e04e8d5c63e90464fc48842482bb4051c01fa3f5 | |
| parent | d5667656353a6ce8247d1e1c125471688c679bd8 (diff) | |
BGE bugfix, ipo actuator's foce option didnt check that the object was dynamic.
| -rw-r--r-- | source/blender/src/buttons_logic.c | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_IPO_SGController.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c index 78bab43a3c1..b7ce16f50a6 100644 --- a/source/blender/src/buttons_logic.c +++ b/source/blender/src/buttons_logic.c @@ -1857,7 +1857,7 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh but = uiDefButBitS(block, TOG, ACT_IPOFORCE, ACT_IPOFORCE, "Force", xco+10+(width-20)/2, yco-24, (width-20)/4-10, 19, &ia->flag, 0, 0, 0, 0, - "Convert Ipo to force. Force is applied in global or local coordinate according to Local flag"); + "Apply Ipo as a global or local force depending on the local option (dynamic objects only)"); uiButSetFunc(but, change_ipo_actuator, but, ia); but = uiDefButBitS(block, TOG, ACT_IPOADD, ACT_IPOADD, diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.cpp b/source/gameengine/Ketsji/KX_IPO_SGController.cpp index d3aa924665e..6223643f75a 100644 --- a/source/gameengine/Ketsji/KX_IPO_SGController.cpp +++ b/source/gameengine/Ketsji/KX_IPO_SGController.cpp @@ -143,7 +143,7 @@ bool KX_IpoSGController::Update(double currentTime) { if (m_ipo_as_force == true) { - if (m_game_object && ob) + if (m_game_object && ob && m_game_object->GetPhysicsController()) { m_game_object->GetPhysicsController()->ApplyForce(m_ipo_local ? ob->GetWorldOrientation() * m_ipo_xform.GetPosition() : |