[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43313] branches/bmesh/blender/source/ blender/blenkernel/intern/DerivedMesh.c: fix for error in merge, weightpaint would crash

[Campbell Barton]

Revision: 43313
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43313
Author:   campbellbarton
Date:     2012-01-12 03:39:32 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
fix for error in merge, weightpaint would crash

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2012-01-12 02:41:20 UTC (rev 43312)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2012-01-12 03:39:32 UTC (rev 43313)
@@ -1027,9 +1027,10 @@
 	MPoly *mp = dm->getPolyArray(dm);
 	int i, j, totface=dm->getNumTessFaces(dm), totloop;
 	int *origIndex = dm->getVertDataArray(dm, CD_ORIGINDEX);
-	unsigned char *wtcol_f_step = wtcol_f;
+	unsigned char *wtcol_f_step;
 
 	wtcol_f = MEM_mallocN(sizeof (unsigned char) * totface*4*4, "weightmap_f");
+	wtcol_f_step = wtcol_f;
 
 	/*first add colors to the tesselation faces*/
 	for (i=0; i<totface; i++, mf++, wtcol_f_step += (4 * 4)) {