[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41376] branches/bmesh/blender/source/ blender/blenkernel/intern/subsurf_ccg.c: fix for drawing error, subsurf was adding black vertex colors to its derived mesh (trunk doesn' t do this).

Campbell Barton ideasman42 at gmail.com
Sun Oct 30 04:57:49 CET 2011


Revision: 41376
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41376
Author:   campbellbarton
Date:     2011-10-30 03:57:46 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
fix for drawing error, subsurf was adding black vertex colors to its derived mesh (trunk doesn't do this).

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

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2011-10-30 03:33:08 UTC (rev 41375)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2011-10-30 03:57:46 UTC (rev 41376)
@@ -2613,7 +2613,7 @@
 	int gridInternalEdges;
 	float *w = NULL;
 	WeightTable wtable = {0};
-	MCol *mcol;
+	/* MCol *mcol; */ /* UNUSED */
 	MEdge *medge = NULL;
 	/* MFace *mface = NULL; */
 	MPoly *mpoly = NULL;
@@ -2760,10 +2760,14 @@
 
 	polyOrigIndex = DM_get_face_data_layer(&ccgdm->dm, CD_ORIGINDEX);
 
+#if 0
+	/* this is not in trunk, can gives problems because colors initialize
+	 * as black, just dont do it!, it works fine - campbell */
 	if (!CustomData_has_layer(&ccgdm->dm.faceData, CD_MCOL))
 		DM_add_tessface_layer(&ccgdm->dm, CD_MCOL, CD_CALLOC, NULL);
+	mcol = DM_get_tessface_data_layer(&ccgdm->dm, CD_MCOL);
+#endif
 
-	mcol = DM_get_tessface_data_layer(&ccgdm->dm, CD_MCOL);
 	has_edge_origindex = CustomData_has_layer(&ccgdm->dm.edgeData, CD_ORIGINDEX);
 
 	faceNum = 0;




More information about the Bf-blender-cvs mailing list