diff options
Diffstat (limited to 'source/blender/editors/curve/editcurve.c')
| -rw-r--r-- | source/blender/editors/curve/editcurve.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 139034a22d5..b0efc2ddc50 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -1102,7 +1102,7 @@ static int *initialize_index_map(Object *obedit, int *r_old_totvert) return old_to_new_map; } -static void remap_hooks_and_vertex_parents(Object *obedit) +static void remap_hooks_and_vertex_parents(Main *bmain, Object *obedit) { Object *object; Curve *curve = (Curve *) obedit->data; @@ -1118,7 +1118,7 @@ static void remap_hooks_and_vertex_parents(Object *obedit) return; } - for (object = G.main->object.first; object; object = object->id.next) { + for (object = bmain->object.first; object; object = object->id.next) { ModifierData *md; int index; if ((object->parent) && @@ -1181,7 +1181,7 @@ static void remap_hooks_and_vertex_parents(Object *obedit) } /* load editNurb in object */ -void ED_curve_editnurb_load(Object *obedit) +void ED_curve_editnurb_load(Main *bmain, Object *obedit) { ListBase *editnurb = object_editcurve_get(obedit); @@ -1192,7 +1192,7 @@ void ED_curve_editnurb_load(Object *obedit) Nurb *nu, *newnu; ListBase newnurb = {NULL, NULL}, oldnurb = cu->nurb; - remap_hooks_and_vertex_parents(obedit); + remap_hooks_and_vertex_parents(bmain, obedit); for (nu = editnurb->first; nu; nu = nu->next) { newnu = BKE_nurb_duplicate(nu); @@ -1321,7 +1321,7 @@ static int separate_exec(bContext *C, wmOperator *op) BLI_movelisttolist(&newedit->nurbs, &newnurb); /* 4. put old object out of editmode and delete separated geometry */ - ED_curve_editnurb_load(newob); + ED_curve_editnurb_load(bmain, newob); ED_curve_editnurb_free(newob); curve_delete_segments(oldob, true); |