branches/blender-2.47

Merge from trunk:
	Revision: 15113
	Revision: 15123
	Revision: 15125

source/blender/python/BPY_interface.c

@@ -1222,7 +1222,7 @@ static int bpy_pydriver_create_dict(void)
 {
 	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 @@ static int bpy_pydriver_create_dict(void)
 
 	/* 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) */

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);

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