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, 97 insertions, 0 deletions

diff --git a/source/gameengine/VideoTexture/FilterBlueScreen.h b/source/gameengine/VideoTexture/FilterBlueScreen.h
new file mode 100644
index 00000000000..820e4a44501
--- /dev/null
+++ b/source/gameengine/VideoTexture/FilterBlueScreen.h
@@ -0,0 +1,97 @@
+/* $Id$
+-----------------------------------------------------------------------------
+This source file is part of blendTex library
+
+Copyright (c) 2007 The Zdeno Ash Miklas
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+
+#if !defined FILTERBLUESCREEN_H
+#define FILTERBLUESCREEN_H
+
+#include "Common.h"
+
+#include "FilterBase.h"
+
+
+/// pixel filter for blue screen
+class FilterBlueScreen : public FilterBase
+{
+public:
+	/// constructor
+	FilterBlueScreen (void);
+	/// destructor
+	virtual ~FilterBlueScreen (void) {}
+
+	/// get color
+	unsigned char * getColor (void) { return m_color; }
+	/// set color
+	void setColor (unsigned char red, unsigned char green, unsigned char blue);
+
+	/// get limits for color variation
+	unsigned short * getLimits (void) { return m_limits; }
+	/// set limits for color variation
+	void setLimits (unsigned short minLimit, unsigned short maxLimit);
+
+protected:
+	///  blue screen color (red component first)
+	unsigned char m_color[3];
+	/// limits for color variation - first defines, where ends fully transparent
+	/// color, second defines, where begins fully opaque color
+	unsigned short m_limits[2];
+	/// squared limits for color variation
+	unsigned int m_squareLimits[2];
+	/// distance between squared limits
+	unsigned int m_limitDist;
+
+	/// filter pixel template, source int buffer
+	template <class SRC> unsigned int tFilter (SRC src, short x, short y,
+		short * size, unsigned int pixSize, unsigned int val)
+	{
+		// calculate differences
+		int difRed = int(VT_R(val)) - int(m_color[0]);
+		int difGreen = int(VT_G(val)) - int(m_color[1]);
+		int difBlue = int(VT_B(val)) - int(m_color[2]);
+		// calc distance from "blue screen" color
+		unsigned int dist = (unsigned int)(difRed * difRed + difGreen * difGreen
+			+ difBlue * difBlue);
+		// condition for fully transparent color
+		if (m_squareLimits[0] >= dist) 
+			// return color with zero alpha
+			VT_A(val) = 0;
+		// condition for fully opaque color
+		else if (m_squareLimits[1] <= dist)
+			// return normal colour
+			VT_A(val) = 0xFF;
+		// otherwise calc alpha
+		else
+			VT_A(val) = (((dist - m_squareLimits[0]) << 8) / m_limitDist);
+		return val;
+	}
+
+	/// virtual filtering function for byte source
+	virtual unsigned int filter (unsigned char * src, short x, short y,
+		short * size, unsigned int pixSize, unsigned int val = 0)
+	{ return tFilter(src, x, y, size, pixSize, val); }
+	/// virtual filtering function for unsigned int source
+	virtual unsigned int filter (unsigned int * src, short x, short y,
+		short * size, unsigned int pixSize, unsigned int val = 0)
+	{ return tFilter(src, x, y, size, pixSize, val); }
+};
+
+
+#endif