[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56488] trunk/blender/source/blender/ blenkernel/intern/DerivedMesh.c: correct own recent commit, confused totloop with dm_totloop, rename vars & correct even though in this case the error was harmless.

Campbell Barton ideasman42 at gmail.com
Fri May 3 10:37:18 CEST 2013


Revision: 56488
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56488
Author:   campbellbarton
Date:     2013-05-03 08:37:18 +0000 (Fri, 03 May 2013)
Log Message:
-----------
correct own recent commit, confused totloop with dm_totloop, rename vars & correct even though in this case the error was harmless.

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

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2013-05-03 07:29:25 UTC (rev 56487)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2013-05-03 08:37:18 UTC (rev 56488)
@@ -1244,22 +1244,22 @@
 		unsigned char(*wtcol_l)[4] = CustomData_get_layer(dm->getLoopDataLayout(dm), CD_PREVIEW_MLOOPCOL);
 		MLoop *mloop = dm->getLoopArray(dm), *ml;
 		MPoly *mp = dm->getPolyArray(dm);
-		int totloop;
+		int l_index;
 		int j;
 
 		/* now add to loops, so the data can be passed through the modifier stack */
 		/* If no CD_PREVIEW_MLOOPCOL existed yet, we have to add a new one! */
 		if (!wtcol_l) {
 			wtcol_l = MEM_mallocN(sizeof(*wtcol_l) * dm_totloop, __func__);
-			CustomData_add_layer(&dm->loopData, CD_PREVIEW_MLOOPCOL, CD_ASSIGN, wtcol_l, totloop);
+			CustomData_add_layer(&dm->loopData, CD_PREVIEW_MLOOPCOL, CD_ASSIGN, wtcol_l, dm_totloop);
 		}
 
-		totloop = 0;
+		l_index = 0;
 		for (i = 0; i < dm_totpoly; i++, mp++) {
 			ml = mloop + mp->loopstart;
 
-			for (j = 0; j < mp->totloop; j++, ml++, totloop++) {
-				copy_v4_v4_char((char *)&wtcol_l[totloop],
+			for (j = 0; j < mp->totloop; j++, ml++, l_index++) {
+				copy_v4_v4_char((char *)&wtcol_l[l_index],
 				                (char *)&wtcol_v[ml->v]);
 			}
 		}




More information about the Bf-blender-cvs mailing list