Revision: 16267
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16267
Author: campbellbarton
Date: 2008-08-27 08:02:10 +0200 (Wed, 27 Aug 2008)
Log Message:
-----------
BGE bugfix, ipo actuator's foce option didnt check that the object was dynamic.
Modified Paths:
--------------
trunk/blender/source/blender/src/buttons_logic.c
trunk/blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp
Modified: trunk/blender/source/blender/src/buttons_logic.c
===================================================================
--- trunk/blender/source/blender/src/buttons_logic.c 2008-08-27 03:41:29 UTC
(rev 16266)
+++ trunk/blender/source/blender/src/buttons_logic.c 2008-08-27 06:02:10 UTC
(rev 16267)
@@ -1857,7 +1857,7 @@
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,
Modified: trunk/blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp
2008-08-27 03:41:29 UTC (rev 16266)
+++ trunk/blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp
2008-08-27 06:02:10 UTC (rev 16267)
@@ -143,7 +143,7 @@
{
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() :
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
