[Bf-blender-cvs] [e6ce7b98059] fracture_modifier: fix for bound object lagging behind one frame

[Martin Felke]

Commit: e6ce7b9805969da46a232bd5cfb6fa8f33f67698
Author: Martin Felke
Date:   Thu Jan 10 19:27:38 2019 +0100
Branches: fracture_modifier
https://developer.blender.org/rBe6ce7b9805969da46a232bd5cfb6fa8f33f67698

fix for bound object lagging behind one frame

===================================================================

M	source/blender/blenkernel/intern/rigidbody.c

===================================================================

diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 889a3653174..ab47a101d84 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -2316,6 +2316,12 @@ void BKE_rigidbody_aftertrans_update(Object *ob, float loc[3], float rot[3], flo
 			do_reset_rigidbody(rbo, ob, mi, loc, rot, quat, rotAxis, rotAngle);
 			if (rbo->flag & RBO_FLAG_KINEMATIC)
 			{
+
+				if (rmd->use_animated_mesh && rmd->anim_mesh_ob)
+				{
+					BKE_read_animated_loc_rot(rmd, ob, false);
+				}
+
 				rigidbody_passive_fake_parenting(rmd, ob, rbo, imat);
 			}
 			else
@@ -5245,6 +5251,7 @@ static bool do_update_modifier(Scene* scene, Object* ob, RigidBodyWorld *rbw, bo
 		BKE_object_where_is_calc(scene, ob);
 		fmd->constraint_island_count = 1;
 
+#if 0
 		if ((ob->rigidbody_object && (ob->rigidbody_object->flag & RBO_FLAG_KINEMATIC) //&&
 		     /*fmd->fracture_mode == MOD_FRACTURE_PREFRACTURED*/)) {
 
@@ -5253,6 +5260,7 @@ static bool do_update_modifier(Scene* scene, Object* ob, RigidBodyWorld *rbw, bo
 				BKE_read_animated_loc_rot(fmd, ob, false);
 			}
 		}
+#endif
 
 		for (mi = fmd->meshIslands.first; mi; mi = mi->next) {
 			if (mi->rigidbody == NULL) {
@@ -5543,6 +5551,13 @@ static bool do_sync_modifier(ModifierData *md, Object *ob, RigidBodyWorld *rbw,
 						}
 					}
 #endif
+					if ((ob->rigidbody_object && (ob->rigidbody_object->flag & RBO_FLAG_KINEMATIC)))
+					{
+						if (fmd->use_animated_mesh && fmd->anim_mesh_ob)
+						{
+							BKE_read_animated_loc_rot(fmd, ob, false);
+						}
+					}
 					rigidbody_passive_fake_parenting(fmd, ob, rbo, imat);
 				}