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 | |
| parent | 7f5abb7fe2681d8f72d1d29c6567077b70351112 (diff) | |
building the BGE without bullet works again.
Diffstat (limited to 'source')
| -rw-r--r-- | source/creator/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 3 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index c32329e20ff..dd218e474a4 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -538,13 +538,13 @@ ENDIF(WITH_MOD_FLUID) bf_intern_ctr bf_blroutines bf_converter - bf_dummy + bf_dummy bf_bullet bf_intern_smoke extern_minilzo extern_lzma - bf_common bf_ketsji + bf_common bf_logic bf_rasterizer bf_oglrasterizer 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); diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 3d7fcb25f2b..3753f3d6bd6 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1073,8 +1073,9 @@ void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj, bool use_gfx, bool u blendobj->parent && // original object had armature (not sure this test is needed) blendobj->parent->type == OB_ARMATURE && blendmesh->dvert!=NULL; // mesh has vertex group +#ifdef USE_BULLET bool bHasSoftBody = (!parentobj && (blendobj->gameflag & OB_SOFT_BODY)); - +#endif bool releaseParent = true; |