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, 25 insertions, 33 deletions

diff --git a/source/gameengine/Rasterizer/RAS_IRenderTools.h b/source/gameengine/Rasterizer/RAS_IRenderTools.h
index b4c0386613f..57f331e64cb 100644
--- a/source/gameengine/Rasterizer/RAS_IRenderTools.h
+++ b/source/gameengine/Rasterizer/RAS_IRenderTools.h
@@ -31,6 +31,7 @@
 
 #include "MT_Transform.h"
 #include "RAS_IRasterizer.h"
+#include "RAS_2DFilterManager.h"
 
 #include <vector>
 #include <algorithm>
@@ -38,18 +39,17 @@
 class		RAS_IPolyMaterial;
 struct		RAS_LightObject;
 
+
 class RAS_IRenderTools
 {
 
 protected:
-	float	m_viewmat[16];
 	void*	m_clientobject;
 	void*	m_auxilaryClientInfo;
 
-	bool	m_modified;
-	
 	std::vector<struct	RAS_LightObject*> m_lights;
-
+	
+	RAS_2DFilterManager m_filtermanager;
 
 public:
 	enum RAS_TEXT_RENDER_MODE {
@@ -58,11 +58,14 @@ public:
 		RAS_TEXT_PADDED,
 		RAS_TEXT_MAX
 	};
-	
+	enum RAS_LIGHT_MODE {
+		RAS_LIGHT_NONE = -1,
+		RAS_LIGHT_OBJECT_LAYER = 0
+	};
+
 	RAS_IRenderTools(
 	) :
-		m_clientobject(NULL),
-		m_modified(true)
+		m_clientobject(NULL)
 	{
 	};
 
@@ -124,23 +127,21 @@ public:
 		float v1[3],
 		float v2[3],
 		float v3[3],
-		float v4[3]
+		float v4[3],
+		int glattrib
 	)=0;
 
 	virtual 
-		void	
-	SetViewMat(
-		const MT_Transform& trans
-	);
-
-	virtual 
-		int		
+		void		
 	ProcessLighting(
-		int layer
+		int layer,
+		const MT_Transform& trans
 	)=0;
 
+	virtual
 		void	
 	SetClientObject(
+		RAS_IRasterizer* rasty,
 		void* obj
 	);
 
@@ -175,25 +176,16 @@ public:
 		void
 	MotionBlur(RAS_IRasterizer* rasterizer)=0;
 
-	virtual 
-		class RAS_IPolyMaterial*	
-	CreateBlenderPolyMaterial(
-		const STR_String &texname,
-		bool ba,
-		const STR_String& matname,
-		int tile,
-		int tilexrep,
-		int tileyrep,
-		int mode,
-		bool transparant,
-		bool zsort,
-		int lightlayer,
-		bool bIsTriangle,
-		void* clientobject,
-		void* tface
-	)=0;
+	virtual
+		void
+		Update2DFilter(vector<STR_String>& propNames, void* gameObj, RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text)=0;
+
+	virtual
+		void
+		Render2DFilters(RAS_ICanvas* canvas)=0;
 };
 
 #endif //__RAS_IRENDERTOOLS
 
 
+