[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15113] trunk/blender/source/gameengine/ Rasterizer/RAS_2DFilterManager.cpp: bugfix #13618 - 2d filters + GLSL python scripts

[Hamed Zaghaghi]

Revision: 15113
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15113
Author:   zaghaghi
Date:     2008-06-04 04:54:42 +0200 (Wed, 04 Jun 2008)

Log Message:
-----------
bugfix #13618 - 2d filters + GLSL python scripts

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	2008-06-04 00:35:10 UTC (rev 15112)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp	2008-06-04 02:54:42 UTC (rev 15113)
@@ -162,10 +162,13 @@
 
 void RAS_2DFilterManager::StartShaderProgram(unsigned int shaderprogram)
 {
-#if defined(GL_ARB_shader_objects) && defined(WITH_GLEXT)
+#if defined(GL_ARB_shader_objects) && defined(WITH_GLEXT)
 	GLint uniformLoc;
 	bgl::blUseProgramObjectARB(shaderprogram);
-	uniformLoc = bgl::blGetUniformLocationARB(shaderprogram, "bgl_RenderedTexture");
+	uniformLoc = bgl::blGetUniformLocationARB(shaderprogram, "bgl_RenderedTexture");
+	glActiveTexture(GL_TEXTURE0);
+	glBindTexture(GL_TEXTURE_2D, texname);
+
     if (uniformLoc != -1)
     {
 		bgl::blUniform1iARB(uniformLoc, 0);