[Bf-blender-cvs] [58161e738d6] temp-fracture-modifier-2.8: animated mesh rotation fix

Martin Felke noreply at git.blender.org
Thu Jan 10 19:29:33 CET 2019


Commit: 58161e738d6044af459b56ab95c508e44903c03f
Author: Martin Felke
Date:   Wed Jan 9 18:45:31 2019 +0100
Branches: temp-fracture-modifier-2.8
https://developer.blender.org/rB58161e738d6044af459b56ab95c508e44903c03f

animated mesh rotation fix

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

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

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

diff --git a/source/blender/blenkernel/intern/fracture.c b/source/blender/blenkernel/intern/fracture.c
index 6c2f06d70a9..376343bcc18 100644
--- a/source/blender/blenkernel/intern/fracture.c
+++ b/source/blender/blenkernel/intern/fracture.c
@@ -1828,9 +1828,13 @@ void BKE_fracture_animated_loc_rot(FractureModifierData *fmd, Object *ob, bool d
 
 				if (fmd->flag & MOD_FRACTURE_USE_ANIMATED_MESH_ROTATION)
 				{
-					float ob_quat[4];
+					float ob_quat[4], anim_quat[4];
 					mat4_to_quat(ob_quat, ob->obmat);
+					mat4_to_quat(anim_quat, fmd->anim_mesh_ob->obmat);
+
 					mul_qt_qtqt(quat, ob_quat, quat);
+					mul_qt_qtqt(quat, anim_quat, quat);
+
 					copy_qt_qt(mi->rigidbody->orn, quat);
 				}



More information about the Bf-blender-cvs mailing list