diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-05-15 16:33:28 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-05-15 16:33:28 +0400 |
| commit | a5dd469a06f15cdf3ec0bfc6c2cb18ba5bba9209 (patch) | |
| tree | 80bc90cc6e34b446a0cb61269ec29cef889f243a /source/blender/blenkernel/intern/cdderivedmesh.c | |
| parent | 8230584582ffaf3db3724205cf580a2913352efe (diff) | |
Fix #35354: dyntopo - materials and UI display issues
Textured dyntopo draw was leaving 2d textures enabled when it shouldn't.
Root of the issue was figured out by Campbell, actual place where
2D textures left enabled found by self.
Also, simplified fix is suggested by Campbell (mine was 2 lines longer! :)
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 8201b657c33..d9dde6debc6 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -658,9 +658,8 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm, */ if (cddm->pbvh && cddm->pbvh_draw && BKE_pbvh_type(cddm->pbvh) == PBVH_BMESH) { if (dm->numTessFaceData) { - glDisable(GL_TEXTURE_2D); + GPU_set_tpage(NULL, false, false); BKE_pbvh_draw(cddm->pbvh, NULL, NULL, NULL, FALSE); - glEnable(GL_TEXTURE_2D); } return; |