diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-18 18:48:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-18 18:48:15 +0400 |
| commit | 24eaf6b9b80a9dedc757a4b883ffd7f36137fd2e (patch) | |
| tree | d426dde078f5cd389cf5923517ab40004bd53a76 /source/blender/editors | |
| parent | a9c99f58f47e4d40ab86803f882f44c8e849b6d9 (diff) | |
replace malloc of a single DeformVertex with stack variable.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 2b35ef5316d..c939b79d205 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -1530,7 +1530,7 @@ static void do_weight_paint_vertex(VPaint *wp, Object *ob, int index, float change = 0; float oldChange = 0; int i; - MDeformVert *dv = NULL; + MDeformVert dv= {NULL}; // Need to know which groups are bone groups if(validmap) { @@ -1564,11 +1564,9 @@ static void do_weight_paint_vertex(VPaint *wp, Object *ob, int index, // setup multi-paint if(selected > 1 && multipaint) { - dv = MEM_mallocN(sizeof (*(me->dvert+index)), "prevMDeformVert"); - - dv->dw= MEM_dupallocN((me->dvert+index)->dw); - dv->flag = me->dvert[index].flag; - dv->totweight = (me->dvert+index)->totweight; + dv.dw= MEM_dupallocN((me->dvert+index)->dw); + dv.flag = me->dvert[index].flag; + dv.totweight = (me->dvert+index)->totweight; tdw = dw; tuw = uw; change = get_mp_change(wp->wpaint_prev+index, defbase_sel, neww-oldw); @@ -1610,13 +1608,12 @@ static void do_weight_paint_vertex(VPaint *wp, Object *ob, int index, } /* Radish */ if(apply_mp_lcks_normalize(me, index, dw, tdw, defbase_len, change, oldChange, oldw, neww, defbase_sel, selected, bone_groups, validmap, flags, multipaint)) { - reset_to_prev(dv, me->dvert+index); + reset_to_prev(&dv, me->dvert+index); change = 0; oldChange = 0; } - if(dv) { - MEM_freeN(dv->dw); - MEM_freeN(dv); + if(dv.dw) { + MEM_freeN(dv.dw); } // dvert may have been altered greatly dw = defvert_find_index(me->dvert+index, vgroup); |