diff options
author | Mitchell Stokes <mogurijin@gmail.com> | 2014-04-23 03:38:34 +0400 |
---|---|---|
committer | Mitchell Stokes <mogurijin@gmail.com> | 2014-04-23 03:42:03 +0400 |
commit | 0f91d2cec9fce85c5557c5669da6685180b756cb (patch) | |
tree | 39081a821b91e57929263fa6bcf548930b391bf2 /source/gameengine | |
parent | 6b9ca060883f57d70e7391d54bc0024d1c7dd807 (diff) |
Fix T39458: Switching physics type from Character to Dynamic enables ghost flag silently
Enabling ghost for Sensors and Characters is now done in conversion
rather than when setting the RNA.
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index f03f4a91531..041dde2918f 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -1645,7 +1645,7 @@ static void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj, } } - objprop.m_ghost = (blenderobject->gameflag & OB_GHOST) != 0; + objprop.m_ghost = (blenderobject->gameflag & (OB_GHOST | OB_SENSOR | OB_CHARACTER)) != 0; objprop.m_disableSleeping = (blenderobject->gameflag & OB_COLLISION_RESPONSE) != 0;//abuse the OB_COLLISION_RESPONSE flag //mmm, for now, taks this for the size of the dynamicobject // Blender uses inertia for radius of dynamic object |