diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-22 15:54:53 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-22 15:54:53 +0400 |
commit | 5c891386842037910f5d522c7d3ffb1792b804db (patch) | |
tree | 133e551d3bf684ea1ccaa8a7d56a4f57b879a95a /source/blender/blenkernel/intern/cdderivedmesh.c | |
parent | 69d0a68f0d7ed82b9701c5a7832f609e4ea4fd75 (diff) |
style cleanup: comments
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 4a852bb0233..474aa84fec6 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -701,14 +701,17 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm, GPU_normal_setup( dm ); GPU_uv_setup( dm ); if ( col != NULL ) { - /*if ( realcol && dm->drawObject->colType == CD_TEXTURE_MCOL ) { +#if 0 + if ( realcol && dm->drawObject->colType == CD_TEXTURE_MCOL ) { col = 0; } else if ( mcol && dm->drawObject->colType == CD_MCOL ) { col = 0; } - if ( col != 0 ) {*/ + if ( col != 0 ) +#endif + { unsigned char *colors = MEM_mallocN(dm->getNumTessFaces(dm)*4*3*sizeof(unsigned char), "cdDM_drawFacesTex_common"); for ( i=0; i < dm->getNumTessFaces(dm); i++ ) { for ( j=0; j < 4; j++ ) { @@ -724,7 +727,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm, dm->drawObject->colType = CD_TEXTURE_MCOL; else if (mcol) dm->drawObject->colType = CD_MCOL; - //} + } GPU_color_setup( dm ); } |