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, 31 insertions, 7 deletions

diff --git a/intern/elbeem/make/msvc_7_0/elbeem.vcproj b/intern/elbeem/make/msvc_7_0/elbeem.vcproj
index 9de4482e2fd..958d74f8fa0 100644
--- a/intern/elbeem/make/msvc_7_0/elbeem.vcproj
+++ b/intern/elbeem/make/msvc_7_0/elbeem.vcproj
@@ -19,8 +19,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\intern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOGUI;ELBEEM_BLENDER=1"
+				AdditionalIncludeDirectories="..\..\intern;..\..\extern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOGUI;ELBEEM_BLENDER=1;LBM_INCLUDE_CONTROL=1"
 				MinimalRebuild="FALSE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -72,8 +72,8 @@ ECHO Done
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\intern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NOGUI;ELBEEM_BLENDER=1"
+				AdditionalIncludeDirectories="..\..\intern;..\..\extern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NOGUI;ELBEEM_BLENDER=1;LBM_INCLUDE_CONTROL=1"
 				StringPooling="TRUE"
 				MinimalRebuild="FALSE"
 				RuntimeLibrary="0"
@@ -126,7 +126,7 @@ ECHO Done
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\intern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include"
+				AdditionalIncludeDirectories="..\..\intern;..\..\extern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOGUI;ELBEEM_BLENDER=1"
 				MinimalRebuild="FALSE"
 				BasicRuntimeChecks="3"
@@ -179,7 +179,7 @@ ECHO Done
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\intern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include"
+				AdditionalIncludeDirectories="..\..\intern;..\..\extern;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\source\kernel\gen_messaging;..\..\..\..\..\lib\windows\sdl\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NOGUI;ELBEEM_BLENDER=1"
 				StringPooling="TRUE"
 				MinimalRebuild="FALSE"
@@ -236,12 +236,21 @@ ECHO Done
 				RelativePath="..\..\intern\attributes.cpp">
 			</File>
 			<File
+				RelativePath="..\..\intern\controlparticles.cpp">
+			</File>
+			<File
 				RelativePath="..\..\intern\elbeem.cpp">
 			</File>
 			<File
+				RelativePath="..\..\intern\elbeem_control.cpp">
+			</File>
+			<File
 				RelativePath="..\..\intern\isosurface.cpp">
 			</File>
 			<File
+				RelativePath="..\..\intern\mvmcoords.cpp">
+			</File>
+			<File
 				RelativePath="..\..\intern\ntl_blenderdumper.cpp">
 			</File>
 			<File
@@ -275,6 +284,9 @@ ECHO Done
 				RelativePath="..\..\intern\solver_adap.cpp">
 			</File>
 			<File
+				RelativePath="..\..\intern\solver_control.cpp">
+			</File>
+			<File
 				RelativePath="..\..\intern\solver_init.cpp">
 			</File>
 			<File
@@ -298,7 +310,13 @@ ECHO Done
 				RelativePath="..\..\intern\attributes.h">
 			</File>
 			<File
-				RelativePath="..\..\intern\elbeem.h">
+				RelativePath="..\..\intern\controlparticles.h">
+			</File>
+			<File
+				RelativePath="..\..\extern\elbeem.h">
+			</File>
+			<File
+				RelativePath="..\..\intern\elbeem_control.h">
 			</File>
 			<File
 				RelativePath="..\..\intern\isosurface.h">
@@ -307,6 +325,9 @@ ECHO Done
 				RelativePath="..\..\intern\mcubes_tables.h">
 			</File>
 			<File
+				RelativePath="..\..\intern\mvmcoords.h">
+			</File>
+			<File
 				RelativePath="..\..\intern\ntl_blenderdumper.h">
 			</File>
 			<File
@@ -352,6 +373,9 @@ ECHO Done
 				RelativePath="..\..\intern\solver_class.h">
 			</File>
 			<File
+				RelativePath="..\..\intern\solver_control.h">
+			</File>
+			<File
 				RelativePath="..\..\intern\solver_interface.h">
 			</File>
 			<File