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

diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
new file mode 100644
index 00000000000..9ec4ea00337
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
@@ -0,0 +1,118 @@
+#include "SCA_IActuator.h"
+
+#include "SCA_2DFilterActuator.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <iostream>
+
+SCA_2DFilterActuator::~SCA_2DFilterActuator()
+{
+}
+
+SCA_2DFilterActuator::SCA_2DFilterActuator(
+        SCA_IObject *gameobj, 
+        RAS_2DFilterManager::RAS_2DFILTER_MODE type,
+		short flag,
+		float float_arg,
+		int int_arg,
+		RAS_IRasterizer* rasterizer,
+		RAS_IRenderTools* rendertools,
+        PyTypeObject* T)
+    : SCA_IActuator(gameobj, T),
+     m_type(type),
+	 m_flag(flag),
+	 m_float_arg(float_arg),
+	 m_int_arg(int_arg),
+	 m_rasterizer(rasterizer),
+	 m_rendertools(rendertools)
+{
+	m_gameObj = NULL;
+	if(gameobj){
+		m_propNames = gameobj->GetPropertyNames();
+		m_gameObj = gameobj;
+	}
+}
+
+void SCA_2DFilterActuator::SetShaderText(STR_String text)
+{
+	m_shaderText = text;
+}
+
+
+
+CValue* SCA_2DFilterActuator::GetReplica()
+{
+    SCA_2DFilterActuator* replica = new SCA_2DFilterActuator(*this);
+    replica->ProcessReplica();
+    CValue::AddDataToReplica(replica);
+
+    return replica;
+}
+
+
+bool SCA_2DFilterActuator::Update()
+{
+	bool bNegativeEvent = IsNegativeEvent();
+	RemoveAllEvents();
+
+
+	if (bNegativeEvent)
+		return false; // do nothing on negative events
+
+	if( m_type == RAS_2DFilterManager::RAS_2DFILTER_MOTIONBLUR )
+	{
+		if(!m_flag)
+			m_rasterizer->EnableMotionBlur(m_float_arg);
+		else
+			m_rasterizer->DisableMotionBlur();
+
+		return false;
+	}
+	else if(m_type < RAS_2DFilterManager::RAS_2DFILTER_NUMBER_OF_FILTERS)
+	{
+		m_rendertools->Update2DFilter(m_propNames, m_gameObj, m_type, m_int_arg, m_shaderText);
+	}
+    return true;
+}
+
+
+PyTypeObject SCA_2DFilterActuator::Type = {
+        PyObject_HEAD_INIT(&PyType_Type)
+        0,
+        "SCA_2DFilterActuator",
+        sizeof(SCA_2DFilterActuator),
+        0,
+        PyDestructor,
+        0,
+        __getattr,
+        __setattr,
+        0, 
+         __repr,
+        0,
+        0,
+        0,
+        0,
+        0
+};
+
+
+PyParentObject SCA_2DFilterActuator::Parents[] = {
+        &SCA_2DFilterActuator::Type,
+        &SCA_IActuator::Type,
+        &SCA_ILogicBrick::Type,
+        &CValue::Type,
+        NULL
+};
+
+
+PyMethodDef SCA_2DFilterActuator::Methods[] = {
+    /* add python functions to deal with m_msg... */
+    {NULL,NULL}
+};
+
+
+PyObject* SCA_2DFilterActuator::_getattr(const STR_String& attr) {
+    _getattr_up(SCA_IActuator);
+}