[Bf-blender-cvs] [48225a46587] blender2.8: Proper fix for building without Bullet

[Sergey Sharybin]

Commit: 48225a4658764cb9d56e48c018bef7b266081744
Author: Sergey Sharybin
Date:   Tue Dec 11 12:37:04 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB48225a4658764cb9d56e48c018bef7b266081744

Proper fix for building without Bullet

Stick to an existing way of dealing with disabled feature.

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

M	source/blender/blenkernel/intern/rigidbody.c
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/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 2d035c271d2..22fb863d829 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -1772,6 +1772,8 @@ bool BKE_rigidbody_check_sim_running(RigidBodyWorld *rbw, float ctime) { return
 void BKE_rigidbody_cache_reset(RigidBodyWorld *rbw) {}
 void BKE_rigidbody_rebuild_world(Depsgraph *depsgraph, Scene *scene, float ctime) {}
 void BKE_rigidbody_do_simulation(Depsgraph *depsgraph, Scene *scene, float ctime) {}
+void BKE_rigidbody_objects_collection_validate(Scene *scene, RigidBodyWorld *rbw) {}
+void BKE_rigidbody_constraints_collection_validate(Scene *scene, RigidBodyWorld *rbw) {}
 
 #if defined(__GNUC__) || defined(__clang__)
 #  pragma GCC diagnostic pop
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 5edeb8ccbbb..49987cb860c 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -88,10 +88,6 @@ 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 d10d86de2bc..abf7c280996 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -2490,7 +2490,6 @@ 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;
@@ -2502,7 +2501,6 @@ 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
 	}
 
 	if (!MAIN_VERSION_ATLEAST(bmain, 280, 37)) {
diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c
index dfdbed0dafd..98833390b0d 100644
--- a/source/blender/makesrna/intern/rna_rigidbody.c
+++ b/source/blender/makesrna/intern/rna_rigidbody.c
@@ -151,19 +151,15 @@ 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);
 }