archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Proper fix for building without Bullet

Browse Source 
Stick to an existing way of dealing with disabled feature.
This commit is contained in:
Sergey Sharybin
2018-12-11 12:37:04 +01:00
parent 49b5d45118
commit 48225a4658
4 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/rigidbody.c
View File

@@ -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

4
source/blender/blenloader/CMakeLists.txt
View File

@@ -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

2
source/blender/blenloader/intern/versioning_280.c
View File

@@ -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)) {

4
source/blender/makesrna/intern/rna_rigidbody.c
View File

@@ -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);
}