svn merge -r39890:39889 source/blender/editors/object/object_relations.c source...
[blender.git] / source / blender / editors / object / object_relations.c
index 9fe0b7d3210e28dee0518efda251ec9600c7fc86..b79d355aa2a5b42683a0d82d534a7be232453f0e 100644 (file)
@@ -92,8 +92,6 @@
 
 #include "ED_armature.h"
 #include "ED_curve.h"
-#include "ED_lattice.h"
-#include "ED_mesh.h"
 #include "ED_keyframing.h"
 #include "ED_object.h"
 #include "ED_screen.h"
@@ -126,11 +124,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
        
        if(obedit->type==OB_MESH) {
                Mesh *me= obedit->data;
-               BMEditMesh *em;
-
-               EDBM_LoadEditBMesh(scene, obedit);
-               EDBM_MakeEditBMesh(scene->toolsettings, scene, obedit);
-               em = me->edit_btmesh;
+               BMEditMesh *em = me->edit_btmesh;
 
                BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
                        if (BM_TestHFlag(eve, BM_SELECT)) {
@@ -143,13 +137,8 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
                }
        }
        else if(ELEM(obedit->type, OB_SURF, OB_CURVE)) {
-               ListBase *editnurb;
-
-               load_editNurb(obedit);
-               make_editNurb(obedit);
-
-               editnurb= curve_get_editcurve(obedit);
-
+               ListBase *editnurb= curve_get_editcurve(obedit);
+               
                cu= obedit->data;
 
                nu= editnurb->first;
@@ -188,13 +177,8 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
                }
        }
        else if(obedit->type==OB_LATTICE) {
-               Lattice *lt;
-
-               load_editLatt(obedit);
-               make_editLatt(obedit);
-
-               lt= obedit->data;
-
+               Lattice *lt= obedit->data;
+               
                a= lt->editlatt->latt->pntsu*lt->editlatt->latt->pntsv*lt->editlatt->latt->pntsw;
                bp= lt->editlatt->latt->def;
                while(a--) {