Merge branch 'master' into blender2.8

[blender.git] / source / blender / blenkernel / intern / editderivedmesh.c

diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index ffd000eed88a029610f22303e08cd53475113dd4..e30dbd706a3c75d97122e3ee465129bf876cdafd 100644 (file)
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -1236,8 +1236,6 @@ static void emDM_drawFacesTex_common(
        // dummylcol.r = dummylcol.g = dummylcol.b = dummylcol.a = 255;  /* UNUSED */
 
        /* always use smooth shading even for flat faces, else vertex colors wont interpolate */
-       glShadeModel(GL_SMOOTH);
-
        BM_mesh_elem_index_ensure(bm, BM_FACE);
 
        /* call again below is ok */
@@ -1384,8 +1382,6 @@ static void emDM_drawFacesTex_common(
                        }
                }
        }
-
-       glShadeModel(GL_FLAT);
 }
 
 static void emDM_drawFacesTex(
@@ -1524,8 +1520,6 @@ static void emDM_drawMappedFacesGLSL(
        vertexNos = bmdm->vertexNos;
        polyNos = bmdm->polyNos;
 
-       /* always use smooth shading even for flat faces, else vertex colors wont interpolate */
-       glShadeModel(GL_SMOOTH);
        BM_mesh_elem_index_ensure(bm, (BM_VERT | BM_FACE) | (lnors ? BM_LOOP : 0));
 
        for (i = 0; i < em->tottri; i++) {
@@ -1636,8 +1630,6 @@ static void emDM_drawMappedFacesMat(
        vertexNos = bmdm->vertexNos;
        polyNos = bmdm->polyNos;
 
-       /* always use smooth shading even for flat faces, else vertex colors wont interpolate */
-       glShadeModel(GL_SMOOTH);
        BM_mesh_elem_index_ensure(bm, (BM_VERT | BM_FACE) | (lnors ? BM_LOOP : 0));
 
        for (i = 0; i < em->tottri; i++) {