[Bf-blender-cvs] [8824482] soc-2014-shapekey: Corrections for getting the derived data for manip

Grigory Revzin noreply at git.blender.org
Fri Jun 6 09:42:50 CEST 2014


Commit: 88244822873af394313b1b4991617d3253b13db7
Author: Grigory Revzin
Date:   Fri Jun 6 11:29:07 2014 +0400
https://developer.blender.org/rB88244822873af394313b1b4991617d3253b13db7

Corrections for getting the derived data for manip

Was getting the wrong DerivedMesh & didn't need customdata

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

M	source/blender/editors/transform/transform_manipulator.c

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

diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index 1dd8026..84bb6a5 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -317,7 +317,7 @@ int calc_manipulator_stats(const bContext *C)
 				{
 					/* if the modifier is set to be on cage (and enabled in editmode), base the selection off 
 					 * the final deform derivedMesh */
-					dm = mesh_get_derived_deform(scene, ob, CD_MASK_DERIVEDMESH);
+					dm = editbmesh_get_derived_cage(scene, ob, em, 0);
 					break;
 				}
 			}
@@ -326,7 +326,7 @@ int calc_manipulator_stats(const bContext *C)
 			if (!dm && BKE_key_from_object(ob) && BKE_keyblock_from_object(ob) && ob->shapeflag & OB_SHAPE_EDIT_MODE) {
 				/* if no modifiers are on-cage-enabled, then use only shapekeys (so the manip is drawn 
 				 * correctly on the cage, not on the final mesh) */
-				dm = editbmesh_get_derived_cage(scene, ob, em, CD_MASK_DERIVEDMESH);
+				dm = editbmesh_get_derived_cage(scene, ob, em, 0);
 			}
 
 			if (dm)




More information about the Bf-blender-cvs mailing list