diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 07:19:58 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 07:19:58 +0400 |
| commit | bd0f7a290b5b9497020fd8e98c9fec96b98a35db (patch) | |
| tree | cc5df08c780291120c1aa9884bbbe56dd7a9267b /source/blender/blenkernel/intern/editderivedmesh.c | |
| parent | 22d326a663b77c8c0c51beeb21858f0f7cd5c9b4 (diff) | |
| parent | 445003973434da55614e90fcee2f99f1765afd8f (diff) | |
svn merge ^/trunk/blender -r44213:44235 --- fixes bmesh shading bug [#30125]
Diffstat (limited to 'source/blender/blenkernel/intern/editderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index 1d90bba655d..ee06600dab6 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -833,11 +833,6 @@ static void emDM_drawFacesTex_common( if (flag != 0) { /* flag 0 == the face is hidden or invisible */ - /* we always want smooth here since otherwise vertex colors dont interpolate */ - if (!has_vcol) { - glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT); - } - if (!drawSmooth) { glNormal3fv(bmdm->polyNos[BM_elem_index_get(efa)]); @@ -903,11 +898,6 @@ static void emDM_drawFacesTex_common( if (flag != 0) { /* flag 0 == the face is hidden or invisible */ - /* we always want smooth here since otherwise vertex colors dont interpolate */ - if (!has_vcol) { - glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT); - } - glBegin(GL_TRIANGLES); if (!drawSmooth) { glNormal3fv(efa->no); @@ -966,6 +956,8 @@ static void emDM_drawFacesTex_common( } } } + + glShadeModel(GL_FLAT); } static void emDM_drawFacesTex( |