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, 28 insertions, 80 deletions

diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript
index 8bf32774be9..203407569b1 100644
--- a/extern/bullet2/src/SConscript
+++ b/extern/bullet2/src/SConscript
@@ -8,90 +8,38 @@ defs = 'USE_DOUBLES QHULL _LIB'
 cflags = []
 
 if env['OURPLATFORM']=='win32-vc':
-	defs += ' WIN32 NDEBUG _WINDOWS _LIB'
-	#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
-	cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6']
+    defs += ' WIN32 NDEBUG _WINDOWS _LIB'
+    #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
+    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':
-	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']
 
 linearmath_src = env.Glob("LinearMath/*.cpp")
-bulletdyn_src = ["BulletDynamics/ConstraintSolver/btContactConstraint.cpp",
-				 "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp",
-				 "BulletDynamics/ConstraintSolver/btHingeConstraint.cpp",
-				 "BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp",
-				 "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp",
-				 "BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp",
-				 "BulletDynamics/ConstraintSolver/btTypedConstraint.cpp",
-				 "BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp",
-				 "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp",
-				 "BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp",
-				 "BulletDynamics/Dynamics/btRigidBody.cpp",
-				 "BulletDynamics/Vehicle/btRaycastVehicle.cpp",
-				 "BulletDynamics/Vehicle/btWheelInfo.cpp"]
-collision_src = ["BulletCollision/BroadphaseCollision/btAxisSweep3.cpp",
-				 "BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp",
-				 "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp",
-				 "BulletCollision/BroadphaseCollision/btDispatcher.cpp",
-				 "BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp",
-				 "BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp",
-				 "BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp",
-				 "BulletCollision/CollisionDispatch/btCollisionObject.cpp",
-				 "BulletCollision/CollisionDispatch/btCollisionWorld.cpp",
-				 "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp",
-				 "BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp",
-				 "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp",
-				 "BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp",
-				 "BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp",
-				 "BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp",
-				 "BulletCollision/CollisionDispatch/btManifoldResult.cpp",
-				 "BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp",
-				 "BulletCollision/CollisionDispatch/btUnionFind.cpp",
-				 "BulletCollision/CollisionShapes/btBoxShape.cpp",
-				 "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp",
-				 "BulletCollision/CollisionShapes/btCollisionShape.cpp",
-				 "BulletCollision/CollisionShapes/btCompoundShape.cpp",
-				 "BulletCollision/CollisionShapes/btConcaveShape.cpp",
-				 "BulletCollision/CollisionShapes/btConeShape.cpp",
-				 "BulletCollision/CollisionShapes/btConvexHullShape.cpp",
-				 "BulletCollision/CollisionShapes/btConvexShape.cpp",
-				 "BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp",
-				 "BulletCollision/CollisionShapes/btCylinderShape.cpp",
-				 "BulletCollision/CollisionShapes/btEmptyShape.cpp",
-				 "BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp",
-				 "BulletCollision/CollisionShapes/btMultiSphereShape.cpp",
-				 "BulletCollision/CollisionShapes/btOptimizedBvh.cpp",
-				 "BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp",
-				 "BulletCollision/CollisionShapes/btTetrahedronShape.cpp",
-				 "BulletCollision/CollisionShapes/btSphereShape.cpp",
-				 "BulletCollision/CollisionShapes/btStaticPlaneShape.cpp",
-				 "BulletCollision/CollisionShapes/btStridingMeshInterface.cpp",
-				 "BulletCollision/CollisionShapes/btTriangleCallback.cpp",
-				 "BulletCollision/CollisionShapes/btTriangleBuffer.cpp",
-				 "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp",
-				 "BulletCollision/CollisionShapes/btTriangleMesh.cpp",
-				 "BulletCollision/CollisionShapes/btTriangleMeshShape.cpp",
-				 "BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp",
-				 "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp",
-				 "BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp",
-				 "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp",
-				 "BulletCollision/NarrowPhaseCollision/btConvexCast.cpp",
-				 "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp",
-				 "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp",
-				 "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp",
-				 "BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp",
-				 "BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp",
-				 "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp",
-				 "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp"]
 
-incs = '. BulletCollision BulletDynamics LinearMath'
+bulletdyn_src = env.Glob("BulletDynamics/Vehicle/*.cpp") + env.Glob("BulletDynamics/ConstraintSolver/*.cpp") + env.Glob("BulletDynamics/Dynamics/*.cpp")
 
-env.BlenderLib ( libname = 'extern_bullet2linmath', sources=linearmath_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[25, 165], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2dynamics', sources=bulletdyn_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 160], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision', sources=collision_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[30, 170], compileflags=cflags )
+collision_broadphase_src = env.Glob("BulletCollision/BroadphaseCollision/*.cpp")
+collision_dispatch_src = env.Glob("BulletCollision/CollisionDispatch/*.cpp")
+collision_gimpact_src = env.Glob("BulletCollision/Gimpact/*.cpp")
+collision_shapes_src =  env.Glob("BulletCollision/CollisionShapes/*.cpp")
+collision_narrowphase_src =  env.Glob("BulletCollision/NarrowPhaseCollision/*.cpp")
+
+softbody_src = env.Glob("BulletSoftBody/*.cpp")
+
+incs = '. BulletCollision BulletDynamics LinearMath BulletSoftBody'
+
+env.BlenderLib ( libname = 'extern_bullet2linmath', sources=linearmath_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2dynamics', sources=bulletdyn_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[19, 169], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_broadphase', sources=collision_broadphase_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[25, 175], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_dispatch', sources=collision_dispatch_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_gimpact', sources=collision_gimpact_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_shapes', sources=collision_shapes_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_narrowphase', sources=collision_narrowphase_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2softbody', sources=softbody_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[18,168], compileflags=cflags )