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

diff --git a/source/gameengine/VideoTexture/FilterBase.cpp b/source/gameengine/VideoTexture/FilterBase.cpp
new file mode 100644
index 00000000000..b0112cd355b
--- /dev/null
+++ b/source/gameengine/VideoTexture/FilterBase.cpp
@@ -0,0 +1,150 @@
+/* $Id$
+-----------------------------------------------------------------------------
+This source file is part of VideoTexture 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.
+-----------------------------------------------------------------------------
+*/
+
+#include "FilterBase.h"
+
+#include <PyObjectPlus.h>
+#include <structmember.h>
+
+
+// FilterBase class implementation
+
+// constructor
+FilterBase::FilterBase (void) : m_previous(NULL) {}
+
+
+// destructor
+FilterBase::~FilterBase (void)
+{
+	// release Python objects, if not released yet
+	release();
+}
+
+
+// release python objects
+void FilterBase::release (void)
+{
+	// release previous filter object
+	setPrevious(NULL);
+}
+
+
+// set new previous filter
+void FilterBase::setPrevious (PyFilter * filt, bool useRefCnt)
+{
+	// if reference counting has to be used
+	if (useRefCnt)
+	{
+		// reference new filter
+		if (filt != NULL) Py_INCREF(filt);
+		// release old filter
+		Py_XDECREF(m_previous);
+	}
+	// set new previous filter
+	m_previous = filt;
+}
+
+
+// find first filter
+FilterBase * FilterBase::findFirst (void)
+{
+	// find first filter in chain
+	FilterBase * frst;
+	for (frst = this; frst->m_previous != NULL; frst = frst->m_previous->m_filter);
+	// set first filter
+	return frst;
+}
+
+
+
+// list offilter types
+PyTypeList pyFilterTypes;
+
+
+
+// functions for python interface
+
+
+// object allocation
+PyObject * Filter_allocNew (PyTypeObject * type, PyObject * args, PyObject * kwds)
+{
+	// allocate object
+	PyFilter * self = reinterpret_cast<PyFilter*>(type->tp_alloc(type, 0));
+	// initialize object structure
+	self->m_filter = NULL;
+	// return allocated object
+	return reinterpret_cast<PyObject*>(self);
+}
+
+// object deallocation
+void Filter_dealloc (PyFilter * self)
+{
+	// release object attributes
+	if (self->m_filter != NULL)
+	{
+		self->m_filter->release();
+		delete self->m_filter;
+		self->m_filter = NULL;
+	}
+}
+
+
+// get previous pixel filter object
+PyObject * Filter_getPrevious (PyFilter * self, void * closure)
+{
+	// if filter object is available
+	if (self->m_filter != NULL)
+	{
+		// pixel filter object
+		PyObject * filt = reinterpret_cast<PyObject*>(self->m_filter->getPrevious());
+		// if filter is present
+		if (filt != NULL)
+		{
+			// return it
+			Py_INCREF(filt);
+			return filt;
+		}
+	}
+	// otherwise return none
+	Py_RETURN_NONE;
+}
+
+
+// set previous pixel filter object
+int Filter_setPrevious (PyFilter * self, PyObject * value, void * closure)
+{
+	// if filter object is available
+	if (self->m_filter != NULL)
+	{
+		// check new value
+		if (value == NULL || !pyFilterTypes.in(value->ob_type))
+		{
+			// report value error
+			PyErr_SetString(PyExc_TypeError, "Invalid type of value");
+			return -1;
+		}
+		// set new value
+		self->m_filter->setPrevious(reinterpret_cast<PyFilter*>(value));
+	}
+	// return success
+	return 0;
+}