diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-17 08:48:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-17 08:48:10 +0400 |
| commit | 575d3dd5baf5786eacc9a0fc85cb48924ee65af3 (patch) | |
| tree | 9d31eb2797804f645d332cb17e60875207b9ce7e /source/blender/blenkernel/intern/cdderivedmesh.c | |
| parent | 5ed449dabb1e668ce1f155db4f52b71a26ed0379 (diff) | |
Fix T40231: Crash with matcaps
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index ba8fe83155e..9df527efa21 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -575,11 +575,16 @@ static void cdDM_drawFacesSolid(DerivedMesh *dm, new_glmode = mface->v4 ? GL_QUADS : GL_TRIANGLES; new_matnr = mface->mat_nr + 1; new_shademodel = (lnors || (mface->flag & ME_SMOOTH)) ? GL_SMOOTH : GL_FLAT; - - if (new_glmode != glmode || new_matnr != matnr || new_shademodel != shademodel) { + + + if ((new_glmode != glmode) || (new_shademodel != shademodel) || + (setMaterial && (new_matnr != matnr))) + { glEnd(); - drawCurrentMat = setMaterial(matnr = new_matnr, NULL); + if (setMaterial) { + drawCurrentMat = setMaterial(matnr = new_matnr, NULL); + } glShadeModel(shademodel = new_shademodel); glBegin(glmode = new_glmode); |