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, 24 insertions, 32 deletions

diff --git a/source/gameengine/Rasterizer/RAS_Polygon.h b/source/gameengine/Rasterizer/RAS_Polygon.h
index 7ce7926a816..18526ba45f7 100644
--- a/source/gameengine/Rasterizer/RAS_Polygon.h
+++ b/source/gameengine/Rasterizer/RAS_Polygon.h
@@ -35,55 +35,47 @@
 #include <vector>
 using namespace std;
 
-
-//
-// Bitfield that stores the flags for each CValue derived class
-//
-struct PolygonFlags {
-	PolygonFlags() :
-		Visible(true),
-		Collider(true)
-	{
-	}
-	unsigned char Visible : 1;
-	unsigned char Collider : 1;
-	//int Visible : 1;
-	//int Collider : 1;
-};
+/* polygon flags */
 
 class RAS_Polygon
 {
+	/* location */
 	RAS_MaterialBucket*			m_bucket;
-	KX_VertexIndex				m_vertexindexbase;
-	int							m_numverts;
-	int							m_edgecode;
-	PolygonFlags				m_polyFlags;
-	
+	RAS_DisplayArray*			m_darray;
+	unsigned short				m_offset[4];
+	unsigned short				m_numvert;
+
+	/* flags */
+	unsigned char				m_edgecode;
+	unsigned char				m_polyflags;
 
 public:
-	RAS_Polygon(RAS_MaterialBucket* bucket,
-				bool visible,
-				int numverts,
-				int vtxarrayindex) ;
+	enum {
+		VISIBLE = 1,
+		COLLIDER = 2
+	};
+
+	RAS_Polygon(RAS_MaterialBucket* bucket, RAS_DisplayArray* darray, int numvert);
 	virtual ~RAS_Polygon() {};
 	
-//	RAS_TexVert* GetVertex(int index);
 	int					VertexCount();
-	void				SetVertex(int i, unsigned int vertexindex); //const MT_Point3& xyz,const MT_Point2& uv,const unsigned int rgbacolor,const MT_Vector3& normal)
-	
-	const KX_VertexIndex& GetIndexBase();
+	RAS_TexVert*		GetVertex(int i);
 
-	void				SetVisibleWireframeEdges(int edgecode);
+	void				SetVertexOffset(int i, unsigned short offset);
+	int					GetVertexOffset(int i);
+	
 	// each bit is for a visible edge, starting with bit 1 for the first edge, bit 2 for second etc.
 	int					GetEdgeCode();
+	void				SetEdgeCode(int edgecode);
 	
 	bool				IsVisible();
+	void				SetVisible(bool visible);
+
 	bool				IsCollider();
-	void				SetCollider(bool col);
+	void				SetCollider(bool collider);
 
-	KX_VertexIndex&		GetVertexIndexBase();
 	RAS_MaterialBucket*	GetMaterial();
-
+	RAS_DisplayArray*	GetDisplayArray();
 };
 
 #endif