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, 35 insertions, 30 deletions

diff --git a/source/blender/SConscript b/source/blender/SConscript
index 2c39a6d6ff8..93acf8a8430 100644
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -3,33 +3,38 @@ Import ('env')
 import sys
 
 SConscript(['avi/SConscript',
-			'blenkernel/SConscript',
-			'blenlib/SConscript',
-			'blenloader/SConscript',
-			'blenpluginapi/SConscript',
-			'editors/SConscript',
-			'imbuf/SConscript',
-			'imbuf/intern/cineon/SConscript',
-			'makesdna/SConscript',
-			'makesrna/SConscript',
-			'python/SConscript',
-			'radiosity/SConscript',
-			'readblenfile/SConscript',
-			'render/SConscript',
-			'nodes/SConscript',
-			'windowmanager/SConscript'])
-
-if env['WITH_BF_YAFRAY'] == 1:
-	SConscript(['yafray/SConscript'])
-
-if env['WITH_BF_INTERNATIONAL'] == 1:
-	SConscript (['ftfont/SConscript'])
-
-if env['WITH_BF_DDS'] == 1:
-	SConscript (['imbuf/intern/dds/SConscript'])
-
-if env['WITH_BF_OPENEXR'] == 1:
-	SConscript (['imbuf/intern/openexr/SConscript'])
-
-if env['WITH_BF_QUICKTIME'] == 1:
-	SConscript (['quicktime/SConscript'])
+            'blenkernel/SConscript',
+            'blenlib/SConscript',
+            'blenloader/SConscript',
+            'blenpluginapi/SConscript',
+            'gpu/SConscript',
+            'editors/SConscript',
+            'imbuf/SConscript',
+            'imbuf/intern/cineon/SConscript',
+            'makesdna/SConscript',
+            'makesrna/SConscript',
+            'radiosity/SConscript',
+            'readblenfile/SConscript',
+            'render/SConscript',
+            'nodes/SConscript',
+            'windowmanager/SConscript'])
+
+
+
+if env['WITH_BF_PYTHON']:
+    SConscript(['python/SConscript'])
+
+if env['WITH_BF_YAFRAY']:
+    SConscript(['yafray/SConscript'])
+
+if env['WITH_BF_INTERNATIONAL']:
+    SConscript (['ftfont/SConscript'])
+
+if env['WITH_BF_DDS']:
+    SConscript (['imbuf/intern/dds/SConscript'])
+
+if env['WITH_BF_OPENEXR']:
+    SConscript (['imbuf/intern/openexr/SConscript'])
+
+if env['WITH_BF_QUICKTIME']:
+    SConscript (['quicktime/SConscript'])