From 48225a4658764cb9d56e48c018bef7b266081744 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 11 Dec 2018 12:37:04 +0100 Subject: Proper fix for building without Bullet Stick to an existing way of dealing with disabled feature. --- source/blender/blenkernel/intern/rigidbody.c | 2 ++ source/blender/blenloader/CMakeLists.txt | 4 ---- source/blender/blenloader/intern/versioning_280.c | 2 -- source/blender/makesrna/intern/rna_rigidbody.c | 4 ---- 4 files changed, 2 insertions(+), 10 deletions(-) (limited to 'source/blender') 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); } -- cgit v1.2.3