diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 07:10:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 07:10:11 +0400 |
| commit | 445003973434da55614e90fcee2f99f1765afd8f (patch) | |
| tree | 0186dfc93e285db1bde059f93e78f48b37835b3d /source/blender/blenkernel/intern/editderivedmesh.c | |
| parent | f75bf20c817d9e09b23513d007bc8cc69ff00d48 (diff) | |
Change texface draw to always use glShadeModel(GL_SMOOTH), with texface draw.
without this each face would get a solid color, this is the same method used in object mode.
also copy BLI_array.h fix from bmesh branch.
Diffstat (limited to 'source/blender/blenkernel/intern/editderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index bb1d20f0187..62f11eb2631 100644 --- 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; } } - else { - glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT); - } glBegin(efa->v4?GL_QUADS:GL_TRIANGLES); if (!drawSmooth) { @@ -564,9 +561,6 @@ static void emDM_drawFacesTex_common( cp= (unsigned char*)mcol; } } - else { - glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT); - } 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( |