Merge with trunk r39928
[blender-staging.git] / source / blender / blenkernel / intern / cdderivedmesh.c
index 5eb97630e83d16fd03ddde1018b2cd846e4b27bd..5e2f0aa5b7a6c417f3812acecd261f5c2e23c689 100644 (file)
@@ -882,7 +882,9 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us
                                if(useColors && mc)
                                        cp = (unsigned char *)&mc[i * 4];
 
-                               glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT);
+                               /* dont set shading mode to flat because
+                               *  normals are used to change shading */
+                               glShadeModel(GL_SMOOTH);
                                glBegin(mf->v4?GL_QUADS:GL_TRIANGLES);
 
                                if (!drawSmooth) {