svn merge -r39877:39878 https://svn.blender.org/svnroot/bf-blender/trunk/blender...

[blender-staging.git] / source / blender / editors / object / object_hook.c

diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index 266556773f09c22a2e6fb6655641d79c343ab318..98375ca03ce7fadbb273081c3c07eead0fff0d0b 100644 (file)
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -57,6 +57,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_deform.h"
+#include "BKE_tessmesh.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
@@ -74,13 +75,14 @@
 
 #include "object_intern.h"
 
-static int return_editmesh_indexar(EditMesh *em, int *tot, int **indexar, float *cent)
+static int return_editmesh_indexar(BMEditMesh *em, int *tot, int **indexar, float *cent)
 {
-       EditVert *eve;
+       BMVert *eve;
+       BMIter iter;
        int *index, nr, totvert=0;
        
-       for(eve= em->verts.first; eve; eve= eve->next) {
-               if(eve->f & SELECT) totvert++;
+       BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+               if(BM_TestHFlag(eve, BM_SELECT)) totvert++;
        }
        if(totvert==0) return 0;
        
@@ -89,8 +91,8 @@ static int return_editmesh_indexar(EditMesh *em, int *tot, int **indexar, float
        nr= 0;
        zero_v3(cent);
        
-       for(eve= em->verts.first; eve; eve= eve->next) {
-               if(eve->f & SELECT) {
+       BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+               if(BM_TestHFlag(eve, BM_SELECT)) {
                        *index= nr; index++;
                        add_v3_v3(cent, eve->co);
                }
@@ -102,7 +104,7 @@ static int return_editmesh_indexar(EditMesh *em, int *tot, int **indexar, float
        return totvert;
 }
 
-static int return_editmesh_vgroup(Object *obedit, EditMesh *em, char *name, float *cent)
+static int return_editmesh_vgroup(Object *obedit, BMEditMesh *em, char *name, float *cent)
 {
        zero_v3(cent);
 
@@ -111,11 +113,12 @@ static int return_editmesh_vgroup(Object *obedit, EditMesh *em, char *name, floa
                int totvert=0;
 
                MDeformVert *dvert;
-               EditVert *eve;
+               BMVert *eve;
+               BMIter iter;
 
                /* find the vertices */
-               for(eve= em->verts.first; eve; eve= eve->next) {
-                       dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
+               BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+                       dvert= CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT);
 
                        if(dvert) {
                                if(defvert_find_weight(dvert, defgrp_index) > 0.0f) {
@@ -135,25 +138,27 @@ static int return_editmesh_vgroup(Object *obedit, EditMesh *em, char *name, floa
        return 0;
 }      
 
-static void select_editmesh_hook(Object *ob, HookModifierData *hmd)
+static void select_editbmesh_hook(Object *ob, HookModifierData *hmd)
 {
        Mesh *me= ob->data;
-       EditMesh *em= BKE_mesh_get_editmesh(me);
-       EditVert *eve;
+       BMEditMesh *em= me->edit_btmesh;
+       BMVert *eve;
+       BMIter iter;
        int index=0, nr=0;
        
        if (hmd->indexar == NULL)
                return;
        
-       for(eve= em->verts.first; eve; eve= eve->next, nr++) {
+       BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
                if(nr==hmd->indexar[index]) {
-                       eve->f |= SELECT;
+                       BM_Select(em->bm, eve, 1);
                        if(index < hmd->totindex-1) index++;
                }
+
+               nr++;
        }
-       EM_select_flush(em);
 
-       BKE_mesh_end_editmesh(me, em);
+       EDBM_selectmode_flush(em);
 }
 
 static int return_editlattice_indexar(Lattice *editlatt, int *tot, int **indexar, float *cent)
@@ -303,20 +308,16 @@ static int object_hook_index_array(Scene *scene, Object *obedit, int *tot, int *
                case OB_MESH:
                {
                        Mesh *me= obedit->data;
-                       EditMesh *em;
-
-                       load_editMesh(scene, obedit);
-                       make_editMesh(scene, obedit);
-
-                       em = BKE_mesh_get_editmesh(me);
+                       BMEditMesh *em;
+                       EDBM_LoadEditBMesh(scene, obedit);
+                       EDBM_MakeEditBMesh(scene->toolsettings, scene, obedit);
+                       em = me->edit_btmesh;
 
                        /* check selected vertices first */
                        if( return_editmesh_indexar(em, tot, indexar, cent_r)) {
-                               BKE_mesh_end_editmesh(me, em);
                                return 1;
                        } else {
                                int ret = return_editmesh_vgroup(obedit, em, name, cent_r);
-                               BKE_mesh_end_editmesh(me, em);
                                return ret;
                        }
                }
@@ -324,12 +325,10 @@ static int object_hook_index_array(Scene *scene, Object *obedit, int *tot, int *
                case OB_SURF:
                        load_editNurb(obedit);
                        make_editNurb(obedit);
-
                        return return_editcurve_indexar(obedit, tot, indexar, cent_r);
                case OB_LATTICE:
                {
                        Lattice *lt= obedit->data;
-
                        load_editLatt(obedit);
                        make_editLatt(obedit);
 
@@ -392,7 +391,7 @@ static void object_hook_select(Object *ob, HookModifierData *hmd)
        if (hmd->indexar == NULL)
                return;
        
-       if(ob->type==OB_MESH) select_editmesh_hook(ob, hmd);
+       if(ob->type==OB_MESH) select_editbmesh_hook(ob, hmd);
        else if(ob->type==OB_LATTICE) select_editlattice_hook(ob, hmd);
        else if(ob->type==OB_CURVE) select_editcurve_hook(ob, hmd);
        else if(ob->type==OB_SURF) select_editcurve_hook(ob, hmd);