From 575d3dd5baf5786eacc9a0fc85cb48924ee65af3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 17 May 2014 14:48:10 +1000 Subject: Fix T40231: Crash with matcaps --- source/blender/blenkernel/intern/cdderivedmesh.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c') 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); -- cgit v1.2.3