Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHamed Zaghaghi <hamed.zaghaghi@gmail.com>2008-06-04 06:54:42 +0400
committerHamed Zaghaghi <hamed.zaghaghi@gmail.com>2008-06-04 06:54:42 +0400
commitd565e8a02f94e61fbebcfbcdcef1f547b4e6b65b (patch)
treec7b9f8f4e5549fc9aba645b864b27994ab5aea6f /source/gameengine/Rasterizer
parent772d241582a8d396425cd7f53438871858669a99 (diff)
bugfix #13618 - 2d filters + GLSL python scripts
Diffstat (limited to 'source/gameengine/Rasterizer')
-rw-r--r--source/gameengine/Rasterizer/RAS_2DFilterManager.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
index 9454edfacfe..e8562c54539 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
@@ -166,6 +166,9 @@ void RAS_2DFilterManager::StartShaderProgram(unsigned int shaderprogram)
GLint uniformLoc;
bgl::blUseProgramObjectARB(shaderprogram);
uniformLoc = bgl::blGetUniformLocationARB(shaderprogram, "bgl_RenderedTexture");
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D, texname);
+
if (uniformLoc != -1)
{
bgl::blUniform1iARB(uniformLoc, 0);