diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-23 18:48:29 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-23 18:48:46 +0300 |
| commit | 04e9a707f4cec2dfd88ac595de29c941f677f3c4 (patch) | |
| tree | 65a37c3d3f5080485cf08c50b7c70b75db42afdd /source/blender | |
| parent | b318795c3b3dc3bc274dfb445b4eb11b1fd6257e (diff) | |
Subsurf: Make color layer aquisition order for textured draw match
cdderivedmesh
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index e8bca50c3d7..edf0bfce8c8 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); |