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

diff --git a/source/blender/imbuf/intern/dds/ColorBlock.h b/source/blender/imbuf/intern/dds/ColorBlock.h
index 0d195f73811..537c17346a1 100644
--- a/source/blender/imbuf/intern/dds/ColorBlock.h
+++ b/source/blender/imbuf/intern/dds/ColorBlock.h
@@ -41,23 +41,26 @@
 struct ColorBlock
 {
 	ColorBlock();
+	ColorBlock(const uint * linearImage);
 	ColorBlock(const ColorBlock & block);
-	ColorBlock(const Image * img, unsigned int x, unsigned int y);
+	ColorBlock(const Image * img, uint x, uint y);
 	
-	void init(const Image * img, unsigned int x, unsigned int y);
+	void init(const Image * img, uint x, uint y);
 	
 	void swizzleDXT5n();
 	void splatX();
 	void splatY();
 	
-	unsigned int countUniqueColors() const;
+	bool isSingleColor() const;
+	bool isSingleColorNoAlpha() const;
+	uint countUniqueColors() const;
 	Color32 averageColor() const;
+	bool hasAlpha() const;
 	
 	void diameterRange(Color32 * start, Color32 * end) const;
 	void luminanceRange(Color32 * start, Color32 * end) const;
 	void boundsRange(Color32 * start, Color32 * end) const;
 	void boundsRangeAlpha(Color32 * start, Color32 * end) const;
-	void bestFitRange(Color32 * start, Color32 * end) const;
 	
 	void sortColorsByAbsoluteValue();
 
@@ -66,11 +69,11 @@ struct ColorBlock
 	// Accessors
 	const Color32 * colors() const;
 
-	Color32 color(unsigned int i) const;
-	Color32 & color(unsigned int i);
+	Color32 color(uint i) const;
+	Color32 & color(uint i);
 	
-	Color32 color(unsigned int x, unsigned int y) const;
-	Color32 & color(unsigned int x, unsigned int y);
+	Color32 color(uint x, uint y) const;
+	Color32 & color(uint x, uint y);
 	
 private:
 	
@@ -86,25 +89,25 @@ inline const Color32 * ColorBlock::colors() const
 }
 
 /// Get block color.
-inline Color32 ColorBlock::color(unsigned int i) const
+inline Color32 ColorBlock::color(uint i) const
 {
 	return m_color[i];
 }
 
 /// Get block color.
-inline Color32 & ColorBlock::color(unsigned int i)
+inline Color32 & ColorBlock::color(uint i)
 {
 	return m_color[i];
 }
 
 /// Get block color.
-inline Color32 ColorBlock::color(unsigned int x, unsigned int y) const
+inline Color32 ColorBlock::color(uint x, uint y) const
 {
 	return m_color[y * 4 + x];
 }
 
 /// Get block color.
-inline Color32 & ColorBlock::color(unsigned int x, unsigned int y)
+inline Color32 & ColorBlock::color(uint x, uint y)
 {
 	return m_color[y * 4 + x];
 }