[Bf-blender-cvs] [a49fdbcc674] blender2.8: Fix building w/o bullet

[Campbell Barton]

Commit: a49fdbcc674fe80af2f6cacc8c23d18a5fdbbd97
Author: Campbell Barton
Date:   Tue Dec 11 10:07:43 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBa49fdbcc674fe80af2f6cacc8c23d18a5fdbbd97

Fix building w/o bullet

===================================================================

M       source/blender/blenloader/CMakeLists.txt
M       source/blender/blenloader/intern/versioning_280.c
M       source/blender/makesrna/intern/rna_rigidbody.c

===================================================================

diff --git a/source/blender/blenloader/CMakeLists.txt 
b/source/blender/blenloader/CMakeLists.txt
index 49987cb860c..5edeb8ccbbb 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -88,6 +88,10 @@ if(WITH_CODEC_FFMPEG)
        add_definitions(-DWITH_FFMPEG)
 endif()
 
+if(WITH_BULLET)
+       add_definitions(-DWITH_BULLET)
+endif()
+
 if(WITH_ALEMBIC)
        list(APPEND INC
                ../alembic
diff --git a/source/blender/blenloader/intern/versioning_280.c 
b/source/blender/blenloader/intern/versioning_280.c
index b05be55e8fa..188372ab438 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -2490,6 +2490,7 @@ void blo_do_versions_280(FileData *fd, Library 
*UNUSED(lib), Main *bmain)
                        }
                }
 
+#ifdef WITH_BULLET
                /* Ensure we get valid rigidbody object/constraint data in 
relevant collections' objects. */
                for (Scene *scene = bmain->scene.first; scene; scene = 
scene->id.next) {
                        RigidBodyWorld *rbw = scene->rigidbody_world;
@@ -2501,6 +2502,7 @@ void blo_do_versions_280(FileData *fd, Library 
*UNUSED(lib), Main *bmain)
                        BKE_rigidbody_objects_collection_validate(scene, rbw);
                        BKE_rigidbody_constraints_collection_validate(scene, 
rbw);
                }
+#endif
        }
 
        {
diff --git a/source/blender/makesrna/intern/rna_rigidbody.c 
b/source/blender/makesrna/intern/rna_rigidbody.c
index 15046928ce7..dfdbed0dafd 100644
--- a/source/blender/makesrna/intern/rna_rigidbody.c
+++ b/source/blender/makesrna/intern/rna_rigidbody.c
@@ -151,17 +151,19 @@ static void 
rna_RigidBodyWorld_split_impulse_set(PointerRNA *ptr, bool value)
 
 static void rna_RigidBodyWorld_objects_collection_update(Main *bmain, Scene 
*scene, PointerRNA *ptr)
 {
+#ifdef WITH_BULLET
        RigidBodyWorld *rbw = (RigidBodyWorld *)ptr->data;
-
        BKE_rigidbody_objects_collection_validate(scene, rbw);
+#endif
        rna_RigidBodyWorld_reset(bmain, scene, ptr);
 }
 
 static void rna_RigidBodyWorld_constraints_collection_update(Main *bmain, 
Scene *scene, PointerRNA *ptr)
 {
+#ifdef WITH_BULLET
        RigidBodyWorld *rbw = (RigidBodyWorld *)ptr->data;
-
        BKE_rigidbody_constraints_collection_validate(scene, rbw);
+#endif
        rna_RigidBodyWorld_reset(bmain, scene, ptr);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs