Merge of trunk into blender 2.5:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416

Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
  later added in trunk also, but reverted partially, specifically revision
  16683. I have left out this reversion in the 2.5 branch since I think it is
  needed there.
  http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
  for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
  -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
  differently. Since this is changed so much, and I don't think those fixes
  would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
  initialized when running with -P. The code that initializes the screen there
  I had to disable, that can't work in 2.5 anymore but left it commented as a
  reminder.

Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.

Still to be done:
* Go over files and functions that were moved to a different location but could
  still use changes that were done in trunk.

1 files changed, 98 insertions, 0 deletions

diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.h b/source/gameengine/Rasterizer/RAS_2DFilterManager.h
new file mode 100644
index 00000000000..454643a5077
--- /dev/null
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.h
@@ -0,0 +1,98 @@
+/**
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __RAS_I2DFILTER
+#define __RAS_I2DFILTER
+
+#define MAX_RENDER_PASS	100
+
+class RAS_2DFilterManager
+{
+private:
+	unsigned int	CreateShaderProgram(const char* shadersource);
+	unsigned int	CreateShaderProgram(int filtermode);
+	void		AnalyseShader(int passindex, vector<STR_String>& propNames);
+	void			StartShaderProgram(int passindex);
+	void			EndShaderProgram();
+	void			PrintShaderErrors(unsigned int shader, const char *task, const char *code);
+
+	void SetupTextures(bool depth, bool luminance);
+	void FreeTextures();
+
+	void UpdateOffsetMatrix(RAS_ICanvas* canvas);
+
+	float			textureoffsets[18];
+	float			view[4];
+	/* texname[0] contains render to texture, texname[1] contains depth texture,  texname[2] contains luminance texture*/
+	unsigned int	texname[3]; 
+	int				texturewidth;
+	int				textureheight;
+	int				canvaswidth;
+	int				canvasheight;
+	int				numberoffilters;
+	/* bit 0: enable/disable depth texture
+	 * bit 1: enable/disable luminance texture*/
+	short			texflag[MAX_RENDER_PASS];
+
+	bool			isshadersupported;
+	bool			errorprinted;
+
+	unsigned int	m_filters[MAX_RENDER_PASS];
+	short		m_enabled[MAX_RENDER_PASS];
+
+	// stores object properties to send to shaders in each pass
+	vector<STR_String>	m_properties[MAX_RENDER_PASS];
+	void* m_gameObjects[MAX_RENDER_PASS];
+public:
+	enum RAS_2DFILTER_MODE {
+		RAS_2DFILTER_ENABLED = -2,
+		RAS_2DFILTER_DISABLED = -1,
+		RAS_2DFILTER_NOFILTER = 0,
+		RAS_2DFILTER_MOTIONBLUR,
+		RAS_2DFILTER_BLUR,
+		RAS_2DFILTER_SHARPEN,
+		RAS_2DFILTER_DILATION,
+		RAS_2DFILTER_EROSION,
+		RAS_2DFILTER_LAPLACIAN,
+		RAS_2DFILTER_SOBEL,
+		RAS_2DFILTER_PREWITT,
+		RAS_2DFILTER_GRAYSCALE,
+		RAS_2DFILTER_SEPIA,
+		RAS_2DFILTER_INVERT,
+		RAS_2DFILTER_CUSTOMFILTER,
+		RAS_2DFILTER_NUMBER_OF_FILTERS
+	};
+
+	RAS_2DFilterManager();
+
+	~RAS_2DFilterManager();
+
+	void RenderFilters(RAS_ICanvas* canvas);
+
+	void EnableFilter(vector<STR_String>& propNames, void* gameObj, RAS_2DFILTER_MODE mode, int pass, STR_String& text);
+};
+#endif