diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-11 14:37:04 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-11 14:37:04 +0300 |
commit | 48225a4658764cb9d56e48c018bef7b266081744 (patch) | |
tree | 1c5b811f77e65eb96fbe4a947036222af3e29735 /source/blender/blenloader | |
parent | 49b5d45118b76f7ab0383b30a98192ef6410547b (diff) |
Proper fix for building without Bullet
Stick to an existing way of dealing with disabled feature.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 2 |
2 files changed, 0 insertions, 6 deletions
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)) { |