[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34050] trunk/blender/source/blender/ blenkernel/intern/displist.c: Memory for bevelSplitFlag wasn' t duplicated in copy_displist.

Sergey Sharybin g.ulairi at gmail.com
Mon Jan 3 20:45:08 CET 2011


Revision: 34050
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34050
Author:   nazgul
Date:     2011-01-03 20:45:08 +0100 (Mon, 03 Jan 2011)

Log Message:
-----------
Memory for bevelSplitFlag wasn't duplicated in copy_displist.
Also corrected memory allocation comment for this array.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/displist.c

Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c	2011-01-03 18:57:13 UTC (rev 34049)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c	2011-01-03 19:45:08 UTC (rev 34050)
@@ -150,7 +150,10 @@
 		dln->index= MEM_dupallocN(dl->index);
 		dln->col1= MEM_dupallocN(dl->col1);
 		dln->col2= MEM_dupallocN(dl->col2);
-		
+
+		if(dl->bevelSplitFlag)
+			dln->bevelSplitFlag= MEM_dupallocN(dl->bevelSplitFlag);
+
 		dl= dl->next;
 	}
 }
@@ -1790,7 +1793,7 @@
 							/* CU_2D conflicts with R_NOPUNOFLIP */
 							dl->rt= nu->flag & ~CU_2D;
 
-							dl->bevelSplitFlag= MEM_callocN(sizeof(*dl->col2)*((bl->nr+0x1F)>>5), "col2");
+							dl->bevelSplitFlag= MEM_callocN(sizeof(*dl->col2)*((bl->nr+0x1F)>>5), "bevelSplitFlag");
 							bevp= (BevPoint *)(bl+1);
 	
 							/* for each point of poly make a bevel piece */





More information about the Bf-blender-cvs mailing list