diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-07-14 15:27:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-14 15:36:00 +0300 |
| commit | 0918461d61127f5d7e9dd7d81441a77b4bdd962d (patch) | |
| tree | 256a28c9b586ab8588797bc3e63dec31f485bff8 /source/blender/blenkernel/intern/subsurf_ccg.c | |
| parent | 2cffd6649b0e9b646bc090e4bba90e9873fb2982 (diff) | |
Move from MTFace to MTexPoly w/ texture checks
Part of moving away from MFace.
Diffstat (limited to 'source/blender/blenkernel/intern/subsurf_ccg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 3b2cad6e81b..cc680224c31 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -2291,8 +2291,13 @@ static void ccgDM_drawFacesTex_common(DerivedMesh *dm, gridOffset += gridFaces * gridFaces * numVerts; } - if (drawParams) - draw_option = drawParams(tf, (mcol != NULL), mat_nr); + if (drawParams) { + MTexPoly tpoly; + if (tf) { + ME_MTEXFACE_CPY(&tpoly, tf); + } + draw_option = drawParams(tf ? &tpoly : NULL, (mcol != NULL), mat_nr); + } else if (index != ORIGINDEX_NONE) draw_option = (drawParamsMapped) ? drawParamsMapped(userData, index, mat_nr) : DM_DRAW_OPTION_NORMAL; else |