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/extern/solid/SConscript b/extern/solid/SConscript
index f30b4a39445..7482014c0a4 100644
--- a/extern/solid/SConscript
+++ b/extern/solid/SConscript
@@ -7,28 +7,28 @@ defs = 'USE_DOUBLES QHULL _LIB'
 cflags = []
 
 if env['OURPLATFORM']=='win32-vc':
-	defs += ' WIN32 NDEBUG _WINDOWS _LIB'
-	cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6']
+    defs += ' WIN32 NDEBUG _WINDOWS _LIB'
+    cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6']
 elif env['OURPLATFORM']=='win32-mingw':
-	defs += ' NDEBUG'
-	cflags += ['-O2']
+    defs += ' NDEBUG'
+    cflags += ['-O2']
 elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5' or sys.platform=='openbsd3' or sys.platform=='sunos5':
-	defs += ' NDEBUG'
-	cflags += ['-O2']
+    defs += ' NDEBUG'
+    cflags += ['-O2']
 elif sys.platform=='darwin' :
-	defs += ' NDEBUG'
-	cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math']
+    defs += ' NDEBUG'
+    cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math']
 
 else:
-	print "################################################"
-	print 
-	print "Check if solid builds on your platform correctly"
-	print "Add your platform specific defines"
-	print "and cflags / cxxflags to the"
-	print "extern/solid/SConscript file"
+    print "################################################"
+    print 
+    print "Check if solid builds on your platform correctly"
+    print "Add your platform specific defines"
+    print "and cflags / cxxflags to the"
+    print "extern/solid/SConscript file"
 
 sources = env.Glob('src/*.cpp') + env.Glob('src/convex/*.cpp') + env.Glob('src/complex/*.cpp') + env.Glob('src/broad/*.cpp')
 
 incs = 'include src src/broad src/complex src/convex ../qhull/include'
 
-env.BlenderLib ( libname='extern_solid', sources=sources, includes=Split(incs), defines=Split(defs), libtype=['game2','player'], priority=[50, 65] , compileflags = cflags)
+env.BlenderLib ( libname='extern_solid', sources=sources, includes=Split(incs), defines=Split(defs), libtype=['game2','player'], priority=[45, 75] , compileflags = cflags)