diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-10-31 04:04:31 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-31 04:04:31 +0300 |
commit | bae43df4ec359fb08a9ae45feb44eb5d24a4e5f8 (patch) | |
tree | 06df2dd77d30853cbe1d7d84c3f6daf22cb41a9f /source/gameengine/Converter | |
parent | 7f5abb7fe2681d8f72d1d29c6567077b70351112 (diff) |
building the BGE without bullet works again.
Diffstat (limited to 'source/gameengine/Converter')
-rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 69483aed1ec..715e5e33e75 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -1740,8 +1740,9 @@ static KX_GameObject *gameobject_from_blenderobject( bool bHasDvert = mesh->dvert != NULL && ob->defbase.first; bool bHasArmature = (BL_ModifierDeformer::HasArmatureDeformer(ob) && ob->parent && ob->parent->type == OB_ARMATURE && bHasDvert); bool bHasModifier = BL_ModifierDeformer::HasCompatibleDeformer(ob); +#ifdef USE_BULLET bool bHasSoftBody = (!ob->parent && (ob->gameflag & OB_SOFT_BODY)); - +#endif if (bHasModifier) { BL_ModifierDeformer *dcont = new BL_ModifierDeformer((BL_DeformableGameObject *)gameobj, kxscene->GetBlenderScene(), ob, meshobj); |