[Bf-blender-cvs] [04e9a70] temp_display_optimization: Subsurf: Make color layer aquisition order for textured draw match cdderivedmesh

[Antony Riakiotakis]

Commit: 04e9a707f4cec2dfd88ac595de29c941f677f3c4
Author: Antony Riakiotakis
Date:   Tue Jun 23 17:48:29 2015 +0200
Branches: temp_display_optimization
https://developer.blender.org/rB04e9a707f4cec2dfd88ac595de29c941f677f3c4

Subsurf: Make color layer aquisition order for textured draw match
cdderivedmesh

===================================================================

M       source/blender/blenkernel/intern/subsurf_ccg.c

===================================================================

diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c 
b/source/blender/blenkernel/intern/subsurf_ccg.c
index e8bca50..edf0bfc 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -2225,7 +2225,8 @@ static void ccgDM_drawFacesTex_common(DerivedMesh *dm,
        CCGDerivedMesh *ccgdm = (CCGDerivedMesh *) dm;
        CCGSubSurf *ss = ccgdm->ss;
        CCGKey key;
-       MCol *mcol = dm->getTessFaceDataArray(dm, CD_PREVIEW_MCOL);
+       int colType = CD_TEXTURE_MCOL;
+       MCol *mcol = dm->getTessFaceDataArray(dm, colType);
        MTFace *tf = DM_get_tessface_data_layer(dm, CD_MTFACE);
        MTFace *tf_stencil_base = NULL;
        MTFace *tf_stencil = NULL;
@@ -2243,11 +2244,14 @@ static void ccgDM_drawFacesTex_common(DerivedMesh *dm,
        CCG_key_top_level(&key, ss);
        ccgdm_pbvh_update(ccgdm);
 
-       if (!mcol)
-               mcol = dm->getTessFaceDataArray(dm, CD_MCOL);
-
-       if (!mcol)
-               mcol = dm->getTessFaceDataArray(dm, CD_TEXTURE_MCOL);
+       if (!mcol) {
+               colType = CD_PREVIEW_MCOL;
+               mcol = dm->getTessFaceDataArray(dm, colType);
+       }
+       if (!mcol) {
+               colType = CD_MCOL;
+               mcol = dm->getTessFaceDataArray(dm, colType);
+       }
 
        totface = ccgSubSurf_getNumFaces(ss);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs