Commit: 3b95b521fc70934bfa513b85918a37c239e1fadc
Author: Campbell Barton
Date: Thu Dec 13 12:20:42 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB3b95b521fc70934bfa513b85918a37c239e1fadc
Cleanup: replace ifdef w/ stub
===================================================================
M source/blender/blenkernel/intern/collection.c
M source/blender/blenkernel/intern/rigidbody.c
===================================================================
diff --git a/source/blender/blenkernel/intern/collection.c
b/source/blender/blenkernel/intern/collection.c
index c13cdb0ca0c..33287d5a2f8 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -517,9 +517,7 @@ static bool collection_object_add(Main *bmain, Collection
*collection, Object *o
}
if ((flag & LIB_ID_CREATE_NO_MAIN) == 0) {
-#ifdef WITH_BULLET
BKE_rigidbody_main_collection_object_add(bmain, collection, ob);
-#endif
}
return true;
diff --git a/source/blender/blenkernel/intern/rigidbody.c
b/source/blender/blenkernel/intern/rigidbody.c
index 7d4bd74389e..4e6d6cf0971 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -1792,6 +1792,7 @@ 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) {}
+void BKE_rigidbody_main_collection_object_add(Main *bmain, Collection
*collection, Object *object) {}
#if defined(__GNUC__) || defined(__clang__)
# pragma GCC diagnostic pop
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
