[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56820] trunk/blender/source/blender/ blenkernel/intern/cdderivedmesh.c: Fix #35354: dyntopo - materials and UI display issues

[Sergey Sharybin]

Revision: 56820
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56820
Author:   nazgul
Date:     2013-05-15 12:33:28 +0000 (Wed, 15 May 2013)
Log Message:
-----------
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! :)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c

Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2013-05-15 12:05:35 UTC (rev 56819)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2013-05-15 12:33:28 UTC (rev 56820)
@@ -658,9 +658,8 @@
 	 */
 	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;