[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45686] trunk/blender/source/blender/ editors/transform/transform_snap.c: bmesh todo: snap to volume with dupli' s works again

[Campbell Barton]

Revision: 45686
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45686
Author:   campbellbarton
Date:     2012-04-16 10:09:26 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
bmesh todo: snap to volume with dupli's works again

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_snap.c

Modified: trunk/blender/source/blender/editors/transform/transform_snap.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_snap.c	2012-04-16 10:02:52 UTC (rev 45685)
+++ trunk/blender/source/blender/editors/transform/transform_snap.c	2012-04-16 10:09:26 UTC (rev 45686)
@@ -1874,10 +1874,9 @@
 	ED_view3d_win_to_ray(ar, v3d, mval, ray_start, ray_normal);
 
 	for (base = scene->base.first; base != NULL; base = base->next) {
-		if ( BASE_SELECTABLE(v3d, base) ) {
+		if (BASE_SELECTABLE(v3d, base)) {
 			Object *ob = base->object;
-			
-#if 0 //BMESH_TODO
+
 			if (ob->transflag & OB_DUPLI) {
 				DupliObject *dupli_ob;
 				ListBase *lb = object_duplilist(scene, ob);
@@ -1887,7 +1886,7 @@
 					Object *dob = dupli_ob->ob;
 					
 					if (dob->type == OB_MESH) {
-						EditMesh *em;
+						BMEditMesh *em;
 						DerivedMesh *dm = NULL;
 						int val;
 
@@ -1897,8 +1896,8 @@
 							val = peelDerivedMesh(dob, dm, dob->obmat, ray_start, ray_normal, mval, depth_peels);
 						}
 						else {
-							em = ((Mesh *)dob->data)->edit_mesh;
-							dm = editmesh_get_derived_cage(scene, obedit, em, CD_MASK_BAREMESH);
+							em = BMEdit_FromObject(dob);
+							dm = editbmesh_get_derived_cage(scene, obedit, em, CD_MASK_BAREMESH);
 							
 							val = peelDerivedMesh(dob, dm, dob->obmat, ray_start, ray_normal, mval, depth_peels);
 						}
@@ -1911,7 +1910,6 @@
 				
 				free_object_duplilist(lb);
 			}
-#endif
 			
 			if (ob->type == OB_MESH) {
 				int val = 0;