[Bf-blender-cvs] [d6eac9d7871] blender2.8: Cleanup: ED_mesh_pick_vert: DM -> me_eval.

[Bastien Montagne]

Commit: d6eac9d78710902f94a8e914845d10ecf680f42f
Author: Bastien Montagne
Date:   Thu Jun 21 18:38:37 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd6eac9d78710902f94a8e914845d10ecf680f42f

Cleanup: ED_mesh_pick_vert: DM -> me_eval.

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

M       source/blender/editors/mesh/mesh_data.c
M       source/blender/editors/mesh/meshtools.c

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

diff --git a/source/blender/editors/mesh/mesh_data.c 
b/source/blender/editors/mesh/mesh_data.c
index 46b84f328cc..b4588257412 100644
--- a/source/blender/editors/mesh/mesh_data.c
+++ b/source/blender/editors/mesh/mesh_data.c
@@ -584,8 +584,8 @@ static int drop_named_image_invoke(bContext *C, wmOperator 
*op, const wmEvent *e
                MEM_freeN(me->edit_btmesh);
                me->edit_btmesh = NULL;
 
-               /* load_editMesh free's pointers used by CustomData layers 
which might be used by DerivedMesh too,
-                * so signal to re-create DerivedMesh here (sergey) */
+               /* load_editMesh free's pointers used by CustomData layers 
which might be used by evaluated mesh too,
+                * so signal to re-create evaluated mesh here (sergey) */
                DEG_id_tag_update(&me->id, 0);
        }
 
diff --git a/source/blender/editors/mesh/meshtools.c 
b/source/blender/editors/mesh/meshtools.c
index 4549c0bccbf..3595a918406 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -54,6 +54,7 @@
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
+#include "BKE_mesh_iterators.h"
 #include "BKE_mesh_runtime.h"
 #include "BKE_material.h"
 #include "BKE_object.h"
@@ -1322,7 +1323,7 @@ bool ED_mesh_pick_vert(bContext *C, Object *ob, const int 
mval[2], unsigned int
        }
        else {
                /* derived mesh to find deformed locations */
-               DerivedMesh *dm = mesh_get_derived_final(vc.depsgraph, 
vc.scene, ob, CD_MASK_BAREMESH);
+               Mesh *me_eval = mesh_get_eval_final(vc.depsgraph, vc.scene, ob, 
CD_MASK_BAREMESH);
                ARegion *ar = vc.ar;
                RegionView3D *rv3d = ar->regiondata;
 
@@ -1334,7 +1335,7 @@ bool ED_mesh_pick_vert(bContext *C, Object *ob, const int 
mval[2], unsigned int
 
                ED_view3d_init_mats_rv3d(ob, rv3d);
 
-               if (dm == NULL) {
+               if (me_eval == NULL) {
                        return false;
                }
 
@@ -1345,9 +1346,7 @@ bool ED_mesh_pick_vert(bContext *C, Object *ob, const int 
mval[2], unsigned int
                data.len_best = FLT_MAX;
                data.v_idx_best = -1;
 
-               dm->foreachMappedVert(dm, ed_mesh_pick_vert__mapFunc, &data, 
DM_FOREACH_NOP);
-
-               dm->release(dm);
+               BKE_mesh_foreach_mapped_vert(me_eval, 
ed_mesh_pick_vert__mapFunc, &data, MESH_FOREACH_NOP);
 
                if (data.v_idx_best == -1) {
                        return false;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs