Change texface draw to always use glShadeModel(GL_SMOOTH), with texface draw.

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

diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index bb1d20f0187a6fa55a57edbee275d8baa5324b9a..62f11eb263110d9a144c290bad4bf7a29a7326d0 100644 (file)
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -488,9 +488,6 @@ static void emDM_drawFacesTex_common(
                                                cp= (unsigned char*)mcol;
                                        }
                                }
                                                cp= (unsigned char*)mcol;
                                        }
                                }

-                               else {
-                                       glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT);
-                               }

 
                                glBegin(efa->v4?GL_QUADS:GL_TRIANGLES);
                                if (!drawSmooth) {
 
                                glBegin(efa->v4?GL_QUADS:GL_TRIANGLES);
                                if (!drawSmooth) {


@@ -564,9 +561,6 @@ static void emDM_drawFacesTex_common(
                                                cp= (unsigned char*)mcol;
                                        }
                                }
                                                cp= (unsigned char*)mcol;
                                        }
                                }

-                               else {
-                                       glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT);
-                               }

 
                                glBegin(efa->v4?GL_QUADS:GL_TRIANGLES);
                                if (!drawSmooth) {
 
                                glBegin(efa->v4?GL_QUADS:GL_TRIANGLES);
                                if (!drawSmooth) {


@@ -617,6 +611,8 @@ static void emDM_drawFacesTex_common(
                        }
                }
        }
                        }
                }
        }

+
+       glShadeModel(GL_FLAT);

 }
 
 static void emDM_drawFacesTex(
 }
 
 static void emDM_drawFacesTex(