[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15639] trunk/blender/source/gameengine/ Ketsji/KX_ParentActuator.cpp: BGE patch: repair RemoveParent actuator after previous commit

[Benoit Bolsee]

Revision: 15639
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15639
Author:   ben2610
Date:     2008-07-19 12:18:54 +0200 (Sat, 19 Jul 2008)

Log Message:
-----------
BGE patch: repair RemoveParent actuator after previous commit

Modified Paths:
--------------
    trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp

Modified: trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp        
2008-07-19 07:45:19 UTC (rev 15638)
+++ trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp        
2008-07-19 10:18:54 UTC (rev 15639)
@@ -113,14 +113,15 @@
        bool bNegativeEvent = IsNegativeEvent();
        RemoveAllEvents();
 
-       if (bNegativeEvent || !m_ob)
+       if (bNegativeEvent)
                return false; // do nothing on negative events
 
        KX_GameObject *obj = (KX_GameObject*) GetParent();
        KX_Scene *scene = PHY_GetActiveScene();
        switch (m_mode) {
                case KX_PARENT_SET:
-                       obj->SetParent(scene, (KX_GameObject*)m_ob);
+                       if (m_ob)
+                               obj->SetParent(scene, (KX_GameObject*)m_ob);
                        break;
                case KX_PARENT_REMOVE:
                        obj->RemoveParent(scene);


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs