diff options
| author | Diego Borghetti <bdiego@gmail.com> | 2008-06-05 04:46:12 +0400 |
|---|---|---|
| committer | Diego Borghetti <bdiego@gmail.com> | 2008-06-05 04:46:12 +0400 |
| commit | 13a23419b9d30340f8ba42844fb68a571410f372 (patch) | |
| tree | 53be5372e6fba48722ccb68d044d92c710116845 /source/gameengine | |
| parent | 2c19984f79e4a9ca5416f226f86ca260c59c838f (diff) | |
branches/blender-2.47
Merge from trunk:
Revision: 15113
Revision: 15123
Revision: 15125
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_2DFilterManager.cpp | 3 | ||||
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h | 4 |
2 files changed, 5 insertions, 2 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); diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h index a18ed038f35..3e24ee204a1 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h @@ -53,9 +53,9 @@ #elif defined(__APPLE__) # include "mac_compat_glext.h" # include <OpenGL/glext.h> -# else +#else # include <GL/glext.h> -# endif +#endif #endif #ifdef __sgi |