[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39885] trunk/blender/source/gameengine/ Rasterizer/RAS_2DFilterManager.cpp: fix [#28462] Tiled textures and 2D filters don't mix

[Campbell Barton]

Revision: 39885
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39885
Author:   campbellbarton
Date:     2011-09-03 04:44:18 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
fix [#28462] Tiled textures and 2D filters don't mix
patch by Juha M?\195?\164ki-Kanto

Modified Paths:
--------------
    trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp	2011-09-03 02:49:21 UTC (rev 39884)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp	2011-09-03 04:44:18 UTC (rev 39885)
@@ -433,6 +433,9 @@
 		glCopyTexImage2D(GL_TEXTURE_2D,0,GL_LUMINANCE16, 0, 0, texturewidth,textureheight, 0);
 	}
 
+	// reverting to texunit 0, without this we get bug [#28462]
+	glActiveTextureARB(GL_TEXTURE0);
+
 	glViewport(0,0, texturewidth, textureheight);
 
 	glDisable(GL_DEPTH_TEST);