Revision: 15128
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15128
Author: bdiego
Date: 2008-06-05 02:46:12 +0200 (Thu, 05 Jun 2008)
Log Message:
-----------
branches/blender-2.47
Merge from trunk:
Revision: 15113
Revision: 15123
Revision: 15125
Modified Paths:
--------------
branches/blender-2.47/source/blender/python/BPY_interface.c
branches/blender-2.47/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
Modified: branches/blender-2.47/source/blender/python/BPY_interface.c
===================================================================
--- branches/blender-2.47/source/blender/python/BPY_interface.c 2008-06-04
23:20:54 UTC (rev 15127)
+++ branches/blender-2.47/source/blender/python/BPY_interface.c 2008-06-05
00:46:12 UTC (rev 15128)
@@ -1222,7 +1222,7 @@
{
PyObject *d, *mod;
- if (bpy_pydriver_Dict || (G.f&G_DOSCRIPTLINKS)==0) return -1;
+ if (bpy_pydriver_Dict) return -1;
d = PyDict_New();
if (!d) return -1;
@@ -1259,15 +1259,16 @@
/* If there's a Blender text called pydrivers.py, import it.
* Users can add their own functions to this module. */
- mod = importText("pydrivers"); /* can also use PyImport_Import() */
- if (mod) {
- PyDict_SetItemString(d, "pydrivers", mod);
- PyDict_SetItemString(d, "p", mod);
- Py_DECREF(mod);
+ if (G.f&G_DOSCRIPTLINKS) {
+ mod = importText("pydrivers"); /* can also use
PyImport_Import() */
+ if (mod) {
+ PyDict_SetItemString(d, "pydrivers", mod);
+ PyDict_SetItemString(d, "p", mod);
+ Py_DECREF(mod);
+ } else {
+ PyErr_Clear();
+ }
}
- else
- PyErr_Clear();
-
/* short aliases for some Get() functions: */
/* ob(obname) == Blender.Object.Get(obname) */
Modified:
branches/blender-2.47/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
===================================================================
--- branches/blender-2.47/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
2008-06-04 23:20:54 UTC (rev 15127)
+++ branches/blender-2.47/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
2008-06-05 00:46:12 UTC (rev 15128)
@@ -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);
Modified:
branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
===================================================================
---
branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
2008-06-04 23:20:54 UTC (rev 15127)
+++
branches/blender-2.47/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
2008-06-05 00:46:12 UTC (rev 15128)
@@ -53,10 +53,10 @@
#elif defined(__APPLE__)
# include "mac_compat_glext.h"
# include <OpenGL/glext.h>
-# else
+#else
# include <GL/glext.h>
-# endif
#endif
+#endif
#ifdef __sgi
# undef GL_ARB_vertex_program
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
