Manipulators now draw on location of optimal subsurf vertices. Looks

nicer, but be aware that these locations are 'virtual', derived from
the actual Mesh Cage vertices you don't see.

Normal transform (and actual transform with Manipulators) remains on
the original vertices, which also shows with dashed line towards pivot
on scale/rotate.

1 files changed, 8 insertions, 1 deletions

diff --git a/source/blender/src/transform_manipulator.c b/source/blender/src/transform_manipulator.c
index c33978b0b66..9bd62e1f801 100644
--- a/source/blender/src/transform_manipulator.c
+++ b/source/blender/src/transform_manipulator.c
@@ -59,6 +59,7 @@
 #include "DNA_view3d_types.h"
 
 #include "BKE_armature.h"
+#include "BKE_DerivedMesh.h"
 #include "BKE_global.h"
 #include "BKE_lattice.h"
 #include "BKE_object.h"
@@ -184,6 +185,8 @@ int calc_manipulator_stats(ScrArea *sa)
 		if((ob->lay & G.vd->lay)==0) return 0;
 
 		if(G.obedit->type==OB_MESH) {
+			int dmNeedsFree;
+			DerivedMesh *dm = mesh_get_cage_derived(G.obedit, &dmNeedsFree);
 			EditMesh *em = G.editMesh;
 			EditVert *eve;
 			float vec[3];
@@ -208,7 +211,8 @@ int calc_manipulator_stats(ScrArea *sa)
 					if(no_faces) VECADD(normal, normal, eve->no);
 					
 					totsel++;
-					calc_tw_center(eve->co);
+					dm->getMappedVertCoEM(dm, eve, vec);
+					calc_tw_center(vec);
 				}
 			}
 			/* the edge case... */
@@ -224,6 +228,9 @@ int calc_manipulator_stats(ScrArea *sa)
 					}
 				}
 			}
+			if (dmNeedsFree) {
+				dm->release(dm);
+			}
 		}
 		else if (G.obedit->type==OB_ARMATURE){
 			EditBone *ebo;