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, 12 insertions, 10 deletions

diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.h b/source/gameengine/Rasterizer/RAS_BucketManager.h
index d99053c1e37..74526f365a0 100644
--- a/source/gameengine/Rasterizer/RAS_BucketManager.h
+++ b/source/gameengine/Rasterizer/RAS_BucketManager.h
@@ -39,31 +39,33 @@
 
 class RAS_BucketManager
 {
-	//GEN_Map<class RAS_IPolyMaterial,class RAS_MaterialBucket*> m_MaterialBuckets;
-	
 	typedef std::vector<class RAS_MaterialBucket*> BucketList;
-	BucketList m_MaterialBuckets;
+	BucketList m_SolidBuckets;
 	BucketList m_AlphaBuckets;
 	
-	struct alphamesh;
+	struct sortedmeshslot;
 	struct backtofront;
+	struct fronttoback;
 
 public:
 	RAS_BucketManager();
 	virtual ~RAS_BucketManager();
 
-	void RenderAlphaBuckets(const MT_Transform& cameratrans, 
-		RAS_IRasterizer* rasty, RAS_IRenderTools* rendertools);
 	void Renderbuckets(const MT_Transform & cameratrans,
-							RAS_IRasterizer* rasty,
-							class RAS_IRenderTools* rendertools);
+		RAS_IRasterizer* rasty, RAS_IRenderTools* rendertools);
 
-	RAS_MaterialBucket* RAS_BucketManagerFindBucket(RAS_IPolyMaterial * material);
+	RAS_MaterialBucket* FindBucket(RAS_IPolyMaterial * material, bool &bucketCreated);
+	void OptimizeBuckets(MT_Scalar distance);
 	
+	void ReleaseDisplayLists(RAS_IPolyMaterial * material = NULL);
 
 private:
-	void RAS_BucketManagerClearAll();
+	void OrderBuckets(const MT_Transform& cameratrans, BucketList& buckets, vector<sortedmeshslot>& slots, bool alpha);
 
+	void RenderSolidBuckets(const MT_Transform& cameratrans, 
+		RAS_IRasterizer* rasty, RAS_IRenderTools* rendertools);
+	void RenderAlphaBuckets(const MT_Transform& cameratrans, 
+		RAS_IRasterizer* rasty, RAS_IRenderTools* rendertools);
 };
 
 #endif //__RAS_BUCKETMANAGER