[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14124] trunk/blender/source/gameengine/ Ketsji/KX_ConvertPhysicsObjects.cpp: BGE fix: ghost objects created with AddObject actuator will retain their ghost property
Benoit Bolsee
benoit.bolsee at online.be
Sat Mar 15 21:52:03 CET 2008
Revision: 14124
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14124
Author: ben2610
Date: 2008-03-15 21:52:03 +0100 (Sat, 15 Mar 2008)
Log Message:
-----------
BGE fix: ghost objects created with AddObject actuator will retain their ghost property
Modified Paths:
--------------
trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
Modified: trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp 2008-03-15 18:53:42 UTC (rev 14123)
+++ trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp 2008-03-15 20:52:03 UTC (rev 14124)
@@ -888,6 +888,10 @@
{
ci.m_collisionFlags |= btCollisionObject::CF_STATIC_OBJECT;
}
+ if (objprop->m_ghost)
+ {
+ ci.m_collisionFlags |= btCollisionObject::CF_NO_CONTACT_RESPONSE;
+ }
ci.m_MotionState = motionstate;
ci.m_gravity = btVector3(0,0,0);
@@ -1141,10 +1145,11 @@
if (objprop->m_disableSleeping)
rbody->setActivationState(DISABLE_DEACTIVATION);
- if (objprop->m_ghost)
- {
- rbody->setCollisionFlags(rbody->getCollisionFlags() | btCollisionObject::CF_NO_CONTACT_RESPONSE);
- }
+ //Now done directly in ci.m_collisionFlags so that it propagates to replica
+ //if (objprop->m_ghost)
+ //{
+ // rbody->setCollisionFlags(rbody->getCollisionFlags() | btCollisionObject::CF_NO_CONTACT_RESPONSE);
+ //}
if (objprop->m_dyna && !objprop->m_angular_rigidbody)
{
/*
More information about the Bf-blender-cvs
mailing list