[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17724] trunk/blender/source/gameengine/ Ketsji: BGE bug #17731 fixed: No sleeping Button disables dynamics of an object if it' s parented+unparented

[Benoit Bolsee]

Revision: 17724
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17724
Author:   ben2610
Date:     2008-12-06 00:13:23 +0100 (Sat, 06 Dec 2008)

Log Message:
-----------
BGE bug #17731 fixed: No sleeping Button disables dynamics of an object if it's parented+unparented

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

Modified: trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp	2008-12-05 18:41:28 UTC (rev 17723)
+++ trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp	2008-12-05 23:13:23 UTC (rev 17724)
@@ -185,7 +185,8 @@
 		m_savedMass = GetMass();
 		m_savedCollisionFilterGroup = handle->m_collisionFilterGroup;
 		m_savedCollisionFilterMask = handle->m_collisionFilterMask;
-		body->setActivationState(DISABLE_SIMULATION);
+		m_savedActivationState = body->getActivationState();
+		body->forceActivationState(DISABLE_SIMULATION);
 		GetPhysicsEnvironment()->updateCcdPhysicsController(this, 
 			0.0,
 			btCollisionObject::CF_STATIC_OBJECT|((ghost)?btCollisionObject::CF_NO_CONTACT_RESPONSE:(m_savedCollisionFlags&btCollisionObject::CF_NO_CONTACT_RESPONSE)),
@@ -204,7 +205,7 @@
 			m_savedCollisionFlags,
 			m_savedCollisionFilterGroup,
 			m_savedCollisionFilterMask);
-		GetRigidBody()->forceActivationState(ACTIVE_TAG);
+		GetRigidBody()->forceActivationState(m_savedActivationState);
 	}
 }
 

Modified: trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.h	2008-12-05 18:41:28 UTC (rev 17723)
+++ trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.h	2008-12-05 23:13:23 UTC (rev 17724)
@@ -9,6 +9,7 @@
 {
 private:
 	int m_savedCollisionFlags;
+	int m_savedActivationState;
 	short int m_savedCollisionFilterGroup;
 	short int m_savedCollisionFilterMask;
 	MT_Scalar m_savedMass;