Commit: 5d1a172783e65a6c4c52ad112aff64d3b63d0b6c
Author: Ray Molenkamp
Date: Mon May 28 14:35:59 2018 -0600
Branches: blender2.8
https://developer.blender.org/rB5d1a172783e65a6c4c52ad112aff64d3b63d0b6c
Merge remote-tracking branch 'origin/master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/rigidbody.c
index 28d5cad3da8,ecb8814dd70..75018bbe5bd
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@@ -1683,10 -1681,10 +1683,10 @@@ void BKE_rigidbody_sync_transforms(Rigi
void BKE_rigidbody_aftertrans_update(Object *ob, float loc[3], float rot[3],
float quat[4], float rotAxis[3], float rotAngle) {}
bool BKE_rigidbody_check_sim_running(RigidBodyWorld *rbw, float ctime) {
return false; }
void BKE_rigidbody_cache_reset(RigidBodyWorld *rbw) {}
-void BKE_rigidbody_rebuild_world(Scene *scene, float ctime) {}
-void BKE_rigidbody_do_simulation(Scene *scene, float ctime) {}
+void BKE_rigidbody_rebuild_world(struct Depsgraph *depsgraph, Scene *scene,
float ctime) {}
+void BKE_rigidbody_do_simulation(struct Depsgraph *depsgraph, Scene *scene,
float ctime) {}
- #ifdef __GNUC__
+ #if defined(__GNUC__) || defined(__clang__)
# pragma GCC diagnostic pop
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
