diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-12-28 13:06:48 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-28 13:06:48 +0400 |
commit | 7730ddb3d6211a9c03e4b2eebedefcfb6f709891 (patch) | |
tree | b233fec2375a2c38fbac44a79be1ae4fbb6f7f55 /source/blender/editors | |
parent | 3f68790108e7a5ab9aa7253d495daded2a325c89 (diff) |
code cleanup:
- free_dverts -> BKE_defvert_array_free
- copy_dverts -> BKE_defvert_array_copy
also move the functions from BKE_mesh into BKE_deform
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/object/object_lattice.c | 10 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c index 4aa2e825954..c9eae776ac7 100644 --- a/source/blender/editors/object/object_lattice.c +++ b/source/blender/editors/object/object_lattice.c @@ -52,7 +52,7 @@ #include "BKE_depsgraph.h" #include "BKE_key.h" #include "BKE_lattice.h" -#include "BKE_mesh.h" +#include "BKE_deform.h" #include "ED_lattice.h" #include "ED_object.h" @@ -77,7 +77,7 @@ void free_editLatt(Object *ob) if (editlt->def) MEM_freeN(editlt->def); if (editlt->dvert) - free_dverts(editlt->dvert, editlt->pntsu * editlt->pntsv * editlt->pntsw); + BKE_defvert_array_free(editlt->dvert, editlt->pntsu * editlt->pntsv * editlt->pntsw); MEM_freeN(editlt); MEM_freeN(lt->editlatt); @@ -104,7 +104,7 @@ void make_editLatt(Object *obedit) if (lt->dvert) { int tot = lt->pntsu * lt->pntsv * lt->pntsw; lt->editlatt->latt->dvert = MEM_mallocN(sizeof(MDeformVert) * tot, "Lattice MDeformVert"); - copy_dverts(lt->editlatt->latt->dvert, lt->dvert, tot); + BKE_defvert_array_copy(lt->editlatt->latt->dvert, lt->dvert, tot); } if (lt->key) lt->editlatt->shapenr = obedit->shapenr; @@ -156,7 +156,7 @@ void load_editLatt(Object *obedit) } if (lt->dvert) { - free_dverts(lt->dvert, lt->pntsu * lt->pntsv * lt->pntsw); + BKE_defvert_array_free(lt->dvert, lt->pntsu * lt->pntsv * lt->pntsw); lt->dvert = NULL; } @@ -164,7 +164,7 @@ void load_editLatt(Object *obedit) tot = lt->pntsu * lt->pntsv * lt->pntsw; lt->dvert = MEM_mallocN(sizeof(MDeformVert) * tot, "Lattice MDeformVert"); - copy_dverts(lt->dvert, editlt->dvert, tot); + BKE_defvert_array_copy(lt->dvert, editlt->dvert, tot); } } diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index c31d40e5474..17bf5c841c3 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -405,7 +405,7 @@ static void free_vpaint_prev(VPaint *vp) static void free_wpaint_prev(VPaint *vp) { if (vp->wpaint_prev) { - free_dverts(vp->wpaint_prev, vp->tot); + BKE_defvert_array_free(vp->wpaint_prev, vp->tot); vp->wpaint_prev = NULL; vp->tot = 0; } @@ -432,7 +432,7 @@ static void copy_wpaint_prev(VPaint *wp, MDeformVert *dverts, int dcount) wp->wpaint_prev = MEM_mallocN(sizeof(MDeformVert) * dcount, "wpaint prev"); wp->tot = dcount; - copy_dverts(wp->wpaint_prev, dverts, dcount); + BKE_defvert_array_copy(wp->wpaint_prev, dverts, dcount); } } @@ -3142,7 +3142,7 @@ static int paint_weight_gradient_modal(bContext *C, wmOperator *op, wmEvent *eve VPaint *wp = ts->wpaint; Object *ob = CTX_data_active_object(C); Mesh *me = ob->data; - copy_dverts(me->dvert, wp->wpaint_prev, me->totvert); + BKE_defvert_array_copy(me->dvert, wp->wpaint_prev, me->totvert); free_wpaint_prev(wp); DAG_id_tag_update(&ob->id, OB_RECALC_DATA); |