[Bf-blender-cvs] [32c41580473] master: Fix Merge > To Cursor

[Dalai Felinto]

Commit: 32c415804734055c4a48bbde3574d43477379f51
Author: Dalai Felinto
Date:   Mon Apr 30 21:34:13 2018 +0200
Branches: master
https://developer.blender.org/rB32c415804734055c4a48bbde3574d43477379f51

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.

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

M	source/blender/editors/mesh/editmesh_tools.c

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

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 {