griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix building w/o bullet

Browse Source
This commit is contained in:
Campbell Barton
2018-12-11 10:07:43 +11:00
parent 8c8e9b5586
commit a49fdbcc67
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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