diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-04-30 22:34:13 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-04-30 22:42:16 +0300 |
| commit | 32c415804734055c4a48bbde3574d43477379f51 (patch) | |
| tree | 97d330d351345d3acbdc141936958423335baf7d /source/blender/editors/mesh | |
| parent | 188c4a22c98fb68377b881e5e20ac759ff329d85 (diff) | |
Fix Merge > To Cursor
In master this is working fine, but in 2.8 ob->imat was identity matrix.
Committing this in master to simplify merging.
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 350d43e2c51..683e69a4ff6 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -2328,6 +2328,7 @@ static bool merge_target( if (use_cursor) { vco = ED_view3d_cursor3d_get(scene, v3d); copy_v3_v3(co, vco); + invert_m4_m4(ob->imat, ob->obmat); mul_m4_v3(ob->imat, co); } else { |