[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40327] branches/soc-2011-radish/source/ blender/editors/sculpt_paint/paint_vertex.c: replace malloc of a single DeformVertex with stack variable.

Campbell Barton ideasman42 at gmail.com
Sun Sep 18 16:48:16 CEST 2011


Revision: 40327
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40327
Author:   campbellbarton
Date:     2011-09-18 14:48:15 +0000 (Sun, 18 Sep 2011)
Log Message:
-----------
replace malloc of a single DeformVertex with stack variable.

Modified Paths:
--------------
    branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c

Modified: branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c	2011-09-18 12:16:03 UTC (rev 40326)
+++ branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c	2011-09-18 14:48:15 UTC (rev 40327)
@@ -1530,7 +1530,7 @@
 	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 @@
 	
 	// 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 @@
 	}
 	/* 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);




More information about the Bf-blender-cvs mailing list