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, 35 insertions, 39 deletions

diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
index 117d6a2be54..a7618462c9b 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
@@ -26,6 +26,7 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
+
 #ifndef __KX_BLENDERRENDERTOOLS
 #define __KX_BLENDERRENDERTOOLS
 
@@ -37,70 +38,65 @@
 #include "RAS_IRenderTools.h"
 
 struct KX_ClientObjectInfo;
+class KX_RayCast;
 
-/**
-BlenderRenderTools are a set of tools to apply 2D/3D graphics effects, which are not
-part of the (polygon) Rasterizer. 
-Effects like 2D text, 3D (polygon) text, lighting.
-*/
+/* BlenderRenderTools are a set of tools to apply 2D/3D graphics effects, which
+ * are not part of the (polygon) Rasterizer. Effects like 2D text, 3D (polygon)
+ * text, lighting.
+ *
+ * Most of this code is duplicated in GPC_RenderTools, so this should be
+ * moved to some common location to avoid duplication. */
 
 class KX_BlenderRenderTools  : public RAS_IRenderTools
 {
-	bool	m_lastblenderlights;
-	void*	m_lastblenderobject;
-	int		m_lastlayer;
+	int		m_lastlightlayer;
 	bool	m_lastlighting;
 	static unsigned int m_numgllights;
-	
+
 public:
-	
 						KX_BlenderRenderTools();
 	virtual				~KX_BlenderRenderTools();	
 
-	virtual void		EndFrame(class RAS_IRasterizer* rasty);
-	virtual void		BeginFrame(class RAS_IRasterizer* rasty);
-	void				DisableOpenGLLights();
+	void				EndFrame(RAS_IRasterizer* rasty);
+	void				BeginFrame(RAS_IRasterizer* rasty);
+
 	void				EnableOpenGLLights();
-	int					ProcessLighting(int layer);
+	void				DisableOpenGLLights();
+	void				ProcessLighting(int layer, const MT_Transform& viewmat);
 
-	virtual void	    RenderText2D(RAS_TEXT_RENDER_MODE mode,
+	void			    RenderText2D(RAS_TEXT_RENDER_MODE mode,
 									 const char* text,
 									 int xco,
 									 int yco,
 									 int width,
 									 int height);
-	virtual void		RenderText(int mode,
+	void				RenderText(int mode,
 								   class RAS_IPolyMaterial* polymat,
 								   float v1[3],
 								   float v2[3],
 								   float v3[3],
-								   float v4[3]);
-	void				applyTransform(class RAS_IRasterizer* rasty,
-									   double* oglmatrix,
-									   int objectdrawmode );
-	int					applyLights(int objectlayer);
-	virtual void		PushMatrix();
-	virtual void		PopMatrix();
-
-	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);
-	
-	bool RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data);
+								   float v4[3],
+								   int glattrib);
+
+	void				applyTransform(RAS_IRasterizer* rasty, double* oglmatrix, int objectdrawmode);
+	int					applyLights(int objectlayer, const MT_Transform& viewmat);
+
+	void				PushMatrix();
+	void				PopMatrix();
+
+	bool RayHit(KX_ClientObjectInfo* client, class KX_RayCast* result, void * const data);
+	bool NeedRayCast(KX_ClientObjectInfo*) { return true; }
 
 	virtual void MotionBlur(RAS_IRasterizer* rasterizer);
+
+	virtual void Update2DFilter(vector<STR_String>& propNames, void* gameObj, RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text);
+
+	virtual	void Render2DFilters(RAS_ICanvas* canvas);
+
+	virtual void SetClientObject(RAS_IRasterizer *rasty, void* obj);
 };
 
 #endif //__KX_BLENDERRENDERTOOLS
 
 
+