diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-06 05:23:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-06 05:23:43 +0400 |
| commit | 7495757553fe16d64dca7fa868845939edbbb06d (patch) | |
| tree | 7fcad54aa4c18c7ea25caac99149a985cb3366c4 /source/blender/editors/object/object_relations.c | |
| parent | 3126ab835d01fb45845993a67214d0292a7c506b (diff) | |
| parent | a01ffbbddb40c8f14f10aa5edf0cd1ba5dcc6942 (diff) | |
svn merge -r39890:39889 source/blender/editors/object/object_relations.c source/blender/editors/object/object_hook.c
This change has been reverted in trunk so reverse merging the merge.
Diffstat (limited to 'source/blender/editors/object/object_relations.c')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 9fe0b7d3210..b79d355aa2a 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -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--) { |