From 965dc3d2d06f4204ecf53dc0ffa3d7bf09b23e1d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 30 Oct 2011 03:57:46 +0000 Subject: [PATCH] fix for drawing error, subsurf was adding black vertex colors to its derived mesh (trunk doesn't do this). --- source/blender/blenkernel/intern/subsurf_ccg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 5841e0a8b99..2fa9ba50c06 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -2613,7 +2613,7 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss, 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 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss, 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 + has_edge_origindex = CustomData_has_layer(&ccgdm->dm.edgeData, CD_ORIGINDEX); faceNum = 0;