[Bf-blender-cvs] [c3d5668516a] fracture_modifier: fix for "double rotation" in bind
Martin Felke
noreply at git.blender.org
Sun Feb 11 10:59:29 CET 2018
Commit: c3d5668516a9ba7bd477efbde190bbd0ceb8decb
Author: Martin Felke
Date: Sun Feb 11 10:58:44 2018 +0100
Branches: fracture_modifier
https://developer.blender.org/rBc3d5668516a9ba7bd477efbde190bbd0ceb8decb
fix for "double rotation" in bind
if both objects were rotated, rotations were added up unnecessarily.
===================================================================
M source/blender/blenkernel/intern/fracture.c
===================================================================
diff --git a/source/blender/blenkernel/intern/fracture.c b/source/blender/blenkernel/intern/fracture.c
index 0131f69c9c4..814ca0fdfb4 100644
--- a/source/blender/blenkernel/intern/fracture.c
+++ b/source/blender/blenkernel/intern/fracture.c
@@ -4202,10 +4202,10 @@ void BKE_read_animated_loc_rot(FractureModifierData *fmd, Object *ob, bool do_bi
{
float ob_quat[4];
mat4_to_quat(ob_quat, ob->obmat);
- //invert_qt(ob_quat);
- mat4_to_quat(anim_quat, fmd->anim_mesh_ob->obmat);
- mul_qt_qtqt(quat, quat, anim_quat);
- mul_qt_qtqt(quat, quat, ob_quat);
+ //mat4_to_quat(anim_quat, fmd->anim_mesh_ob->obmat);
+ //invert_qt(anim_quat);
+ //mul_qt_qtqt(quat, anim_quat, quat);
+ mul_qt_qtqt(quat, ob_quat, quat);
copy_qt_qt(mi->rigidbody->orn, quat);
}
More information about the Bf-blender-cvs
mailing list