[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48381] branches/soc-2012-bratwurst/source /blender/editors/sculpt_paint/paint_cursor.c: Important! Revert to texture unit 0 before resetting matrix or we get

[Antony Riakiotakis]

Revision: 48381
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48381
Author:   psy-fi
Date:     2012-06-28 18:36:49 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
Important! Revert to texture unit 0 before resetting matrix or we get
corruption in the viewport on rake or rotated brushes.

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_cursor.c

Modified: branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_cursor.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_cursor.c	2012-06-28 17:26:21 UTC (rev 48380)
+++ branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_cursor.c	2012-06-28 18:36:49 UTC (rev 48381)
@@ -601,6 +601,7 @@
 		glActiveTexture(GL_TEXTURE1);
 		glDisable(GL_TEXTURE_2D);
 
+		glActiveTexture(GL_TEXTURE0);
 		glPopMatrix();
 	}