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

diff --git a/intern/SConscript b/intern/SConscript
index 2d68969c783..82c7739bf42 100644
--- a/intern/SConscript
+++ b/intern/SConscript
@@ -2,17 +2,17 @@
 Import ('env')
 
 SConscript(['SoundSystem/SConscript',
-			'string/SConscript',
-			'ghost/SConscript',
-			'guardedalloc/SConscript',
-			'bmfont/SConscript',
-			'moto/SConscript',
-			'container/SConscript',
-			'memutil/SConscript/',
-			'decimation/SConscript',
-			'iksolver/SConscript',
-			'boolop/SConscript',
-			'opennl/SConscript'])
+            'string/SConscript',
+            'ghost/SConscript',
+            'guardedalloc/SConscript',
+            'bmfont/SConscript',
+            'moto/SConscript',
+            'container/SConscript',
+            'memutil/SConscript/',
+            'decimation/SConscript',
+            'iksolver/SConscript',
+            'boolop/SConscript',
+            'opennl/SConscript'])
 
 # NEW_CSG was intended for intern/csg, but
 # getting it to compile is difficult
@@ -20,10 +20,10 @@ SConscript(['SoundSystem/SConscript',
 # perhaps get rid of intern/csg?
 NEW_CSG='false'
 
-if env['BF_NO_ELBEEM'] == 0:
-	SConscript(['elbeem/SConscript'])
+if not env['BF_NO_ELBEEM']:
+    SConscript(['elbeem/SConscript'])
 
 if NEW_CSG=='false':
-	SConscript(['bsp/SConscript'])
+    SConscript(['bsp/SConscript'])
 else:
-	SConscript(['csg/SConscript'])
+    SConscript(['csg/SConscript'])