[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19275] branches/etch-a-ton: merging trunk 19093:19274

Martin Poirier theeth at yahoo.com
Fri Mar 13 19:04:40 CET 2009


Revision: 19275
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19275
Author:   theeth
Date:     2009-03-13 19:04:38 +0100 (Fri, 13 Mar 2009)

Log Message:
-----------
merging trunk 19093:19274

Modified Paths:
--------------
    branches/etch-a-ton/CMakeLists.txt
    branches/etch-a-ton/SConstruct
    branches/etch-a-ton/blenderplayer/CMakeLists.txt
    branches/etch-a-ton/extern/CMakeLists.txt
    branches/etch-a-ton/extern/Makefile
    branches/etch-a-ton/extern/SConscript
    branches/etch-a-ton/extern/bullet2/make/msvc_9_0/Bullet.vcproj
    branches/etch-a-ton/extern/bullet2/src/Bullet-C-Api.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CMakeLists.txt
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btClipPolygon.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btGImpactMassUtil.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btGeometryOperations.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_array.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_bitset.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_box_collision.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_clip_polygon.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_geom_types.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_geometry.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_hash_table.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_linear_math.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_math.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/Jamfile
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/CMakeLists.txt
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Jamfile
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/Jamfile
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftBody.h
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
    branches/etch-a-ton/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
    branches/etch-a-ton/extern/bullet2/src/Jamfile
    branches/etch-a-ton/extern/bullet2/src/LinearMath/CMakeLists.txt
    branches/etch-a-ton/extern/bullet2/src/LinearMath/Jamfile
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btAabbUtil2.h
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btAlignedAllocator.h
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btConvexHull.cpp
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btConvexHull.h
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btHashMap.h
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btIDebugDraw.h
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btMatrix3x3.h
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btPoolAllocator.h
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btQuadWord.h
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btQuaternion.h
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btQuickprof.cpp
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btQuickprof.h
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btScalar.h
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btStackAlloc.h
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btTransform.h
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btTransformUtil.h
    branches/etch-a-ton/extern/bullet2/src/LinearMath/btVector3.h
    branches/etch-a-ton/extern/ffmpeg/Makefile
    branches/etch-a-ton/extern/ffmpeg/SConscript
    branches/etch-a-ton/extern/ffmpeg/libavcodec/vp5.c
    branches/etch-a-ton/extern/ffmpeg/libavcodec/vp56.c
    branches/etch-a-ton/extern/ffmpeg/libavcodec/vp6.c
    branches/etch-a-ton/extern/libopenjpeg/SConscript
    branches/etch-a-ton/intern/decimation/SConscript
    branches/etch-a-ton/intern/opennl/SConscript
    branches/etch-a-ton/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/etch-a-ton/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
    branches/etch-a-ton/release/scripts/ply_import.py
    branches/etch-a-ton/source/Makefile
    branches/etch-a-ton/source/blender/blenkernel/CMakeLists.txt
    branches/etch-a-ton/source/blender/blenkernel/SConscript
    branches/etch-a-ton/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    branches/etch-a-ton/source/blender/blenkernel/intern/Makefile
    branches/etch-a-ton/source/blender/blenpluginapi/iff.h
    branches/etch-a-ton/source/blender/imbuf/CMakeLists.txt
    branches/etch-a-ton/source/blender/imbuf/intern/Makefile
    branches/etch-a-ton/source/blender/makesdna/DNA_object_types.h
    branches/etch-a-ton/source/blender/makesdna/DNA_sensor_types.h
    branches/etch-a-ton/source/blender/nodes/CMP_node.h
    branches/etch-a-ton/source/blender/nodes/SConscript
    branches/etch-a-ton/source/blender/nodes/SHD_node.h
    branches/etch-a-ton/source/blender/nodes/TEX_node.h
    branches/etch-a-ton/source/blender/python/api2_2x/Draw.c
    branches/etch-a-ton/source/blender/python/api2_2x/Mathutils.c
    branches/etch-a-ton/source/blender/src/CMakeLists.txt
    branches/etch-a-ton/source/blender/src/Makefile
    branches/etch-a-ton/source/blender/src/SConscript
    branches/etch-a-ton/source/blender/src/buttons_logic.c
    branches/etch-a-ton/source/blender/src/buttons_shading.c
    branches/etch-a-ton/source/blender/src/filesel.c
    branches/etch-a-ton/source/blender/src/transform_conversions.c
    branches/etch-a-ton/source/blender/src/view.c
    branches/etch-a-ton/source/creator/CMakeLists.txt
    branches/etch-a-ton/source/creator/Makefile
    branches/etch-a-ton/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/etch-a-ton/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/etch-a-ton/source/gameengine/BlenderRoutines/Makefile
    branches/etch-a-ton/source/gameengine/BlenderRoutines/SConscript
    branches/etch-a-ton/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/etch-a-ton/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/etch-a-ton/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/etch-a-ton/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/etch-a-ton/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/etch-a-ton/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/etch-a-ton/source/gameengine/Converter/SConscript
    branches/etch-a-ton/source/gameengine/Expressions/FloatValue.cpp
    branches/etch-a-ton/source/gameengine/Expressions/InputParser.cpp
    branches/etch-a-ton/source/gameengine/Expressions/InputParser.h
    branches/etch-a-ton/source/gameengine/Expressions/IntValue.cpp
    branches/etch-a-ton/source/gameengine/Expressions/ListValue.cpp
    branches/etch-a-ton/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/etch-a-ton/source/gameengine/Expressions/PyObjectPlus.h
    branches/etch-a-ton/source/gameengine/Expressions/Value.cpp
    branches/etch-a-ton/source/gameengine/Expressions/Value.h
    branches/etch-a-ton/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_ANDController.cpp
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_ExpressionController.cpp
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_ExpressionController.h
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_IActuator.cpp
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_IActuator.h
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_IController.cpp
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_IObject.cpp
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_ISensor.h
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_NANDController.cpp
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_NORController.cpp
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_ORController.cpp
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_PropertySensor.h
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_PythonController.h
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_XNORController.cpp
    branches/etch-a-ton/source/gameengine/GameLogic/SCA_XORController.cpp
    branches/etch-a-ton/source/gameengine/GamePlayer/common/SConscript
    branches/etch-a-ton/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/etch-a-ton/source/gameengine/GamePlayer/ghost/SConscript
    branches/etch-a-ton/source/gameengine/Ketsji/BL_Shader.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/BL_Shader.h
    branches/etch-a-ton/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_CDActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_Camera.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_ClientObjectInfo.h
    branches/etch-a-ton/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
    branches/etch-a-ton/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_GameActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_GameObject.h
    branches/etch-a-ton/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_Light.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_MouseFocusSensor.h
    branches/etch-a-ton/source/gameengine/Ketsji/KX_NearSensor.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_NearSensor.h
    branches/etch-a-ton/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_RadarSensor.h
    branches/etch-a-ton/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_RaySensor.h
    branches/etch-a-ton/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_Scene.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_Scene.h
    branches/etch-a-ton/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_StateActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/etch-a-ton/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    branches/etch-a-ton/source/gameengine/Ketsji/SConscript
    branches/etch-a-ton/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/etch-a-ton/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/etch-a-ton/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/etch-a-ton/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/etch-a-ton/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/etch-a-ton/source/gameengine/PyDoc/GameLogic.py
    branches/etch-a-ton/source/gameengine/PyDoc/KX_GameObject.py
    branches/etch-a-ton/source/gameengine/PyDoc/KX_NearSensor.py
    branches/etch-a-ton/source/gameengine/PyDoc/KX_RadarSensor.py
    branches/etch-a-ton/source/gameengine/PyDoc/KX_Scene.py
    branches/etch-a-ton/source/gameengine/PyDoc/KX_TouchSensor.py
    branches/etch-a-ton/source/gameengine/PyDoc/SCA_DelaySensor.py
    branches/etch-a-ton/source/gameengine/PyDoc/SCA_PythonController.py
    branches/etch-a-ton/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/etch-a-ton/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/etch-a-ton/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/etch-a-ton/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/etch-a-ton/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/etch-a-ton/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/etch-a-ton/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/etch-a-ton/source/gameengine/SConscript
    branches/etch-a-ton/source/gameengine/SceneGraph/SG_BBox.cpp
    branches/etch-a-ton/source/gameengine/SceneGraph/SG_Spatial.cpp
    branches/etch-a-ton/source/gameengine/SceneGraph/SG_Spatial.h
    branches/etch-a-ton/source/gameengine/VideoTexture/CMakeLists.txt
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterBase.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterSource.h
    branches/etch-a-ton/source/gameengine/VideoTexture/Makefile
    branches/etch-a-ton/source/gameengine/VideoTexture/SConscript
    branches/etch-a-ton/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/VideoFFmpeg.h
    branches/etch-a-ton/source/nan_definitions.mk
    branches/etch-a-ton/source/tools/guess/config.guess
    branches/etch-a-ton/tools/btools.py

Added Paths:
-----------
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.h
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
    branches/etch-a-ton/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h
    branches/etch-a-ton/extern/bullet2/src/BulletDynamics/Dynamics/btActionInterface.h
    branches/etch-a-ton/extern/libopenjpeg/CMakeLists.txt
    branches/etch-a-ton/extern/libopenjpeg/Makefile
    branches/etch-a-ton/release/freedesktop/blender.desktop

Removed Paths:
-------------
    branches/etch-a-ton/extern/libopenjpeg/t1_generate_luts.c

Modified: branches/etch-a-ton/CMakeLists.txt
===================================================================
--- branches/etch-a-ton/CMakeLists.txt	2009-03-13 13:38:41 UTC (rev 19274)
+++ branches/etch-a-ton/CMakeLists.txt	2009-03-13 18:04:38 UTC (rev 19275)
@@ -63,7 +63,7 @@
 OPTION(WITH_OPENEXR		"Enable OpenEXR Support (http://www.openexr.com)"	ON)
 OPTION(WITH_DDS			"Enable DDS Support"                                   	ON)
 OPTION(WITH_FFMPEG		"Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"	OFF)
-OPTION(WITH_FFMPEG		"Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"	OFF)
+OPTION(WITH_OPENJPEG		"Enable OpenJpeg Support (http://www.openjpeg.org/)"	OFF)
 OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
 OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
 OPTION(WITH_WEBPLUGIN		"Enable Web Plugin (Unix only)"				OFF)
@@ -431,6 +431,9 @@
 SET(FTGL_INC ${FTGL}/include)
 SET(FTGL_LIB extern_ftgl)
 
+set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
+set(OPENJPEG_INC ${OPENJPEG})
+set(OPENJPEG_LIb extern_libopenjpeg)
 
 #-----------------------------------------------------------------------------
 # Blender WebPlugin

Modified: branches/etch-a-ton/SConstruct
===================================================================
--- branches/etch-a-ton/SConstruct	2009-03-13 13:38:41 UTC (rev 19274)
+++ branches/etch-a-ton/SConstruct	2009-03-13 18:04:38 UTC (rev 19275)
@@ -280,6 +280,7 @@
 	env['WITH_BF_PNG'] = False
 	env['WITH_BF_ODE'] = False
 	env['WITH_BF_BULLET'] = False
+	env['WITH_BF_SOLID'] = False
 	env['WITH_BF_BINRELOC'] = False
 	env['BF_BUILDINFO'] = False
 	env['BF_NO_ELBEEM'] = True

Modified: branches/etch-a-ton/blenderplayer/CMakeLists.txt
===================================================================
--- branches/etch-a-ton/blenderplayer/CMakeLists.txt	2009-03-13 13:38:41 UTC (rev 19274)
+++ branches/etch-a-ton/blenderplayer/CMakeLists.txt	2009-03-13 18:04:38 UTC (rev 19275)
@@ -104,6 +104,7 @@
     bf_blenlib 
     bf_cineon 
     bf_openexr 
+    extern_libopenjpeg 
     bf_dds
     bf_ftfont 
     extern_ftgl 

Modified: branches/etch-a-ton/extern/CMakeLists.txt
===================================================================
--- branches/etch-a-ton/extern/CMakeLists.txt	2009-03-13 13:38:41 UTC (rev 19274)
+++ branches/etch-a-ton/extern/CMakeLists.txt	2009-03-13 18:04:38 UTC (rev 19275)
@@ -29,7 +29,7 @@
 ENDIF(WITH_GAMEENGINE)
 
 IF(WITH_BULLET)
-    SUBDIRS(bullet2)
+  SUBDIRS(bullet2)
 ENDIF(WITH_BULLET)
 
 IF(WITH_INTERNATIONAL)
@@ -46,3 +46,6 @@
 
 SUBDIRS(glew)
 
+IF(WITH_OPENJPEG)
+  SUBDIRS(libopenjpeg)
+ENDIF(WITH_OPENJPEG)

Modified: branches/etch-a-ton/extern/Makefile
===================================================================
--- branches/etch-a-ton/extern/Makefile	2009-03-13 13:38:41 UTC (rev 19274)
+++ branches/etch-a-ton/extern/Makefile	2009-03-13 18:04:38 UTC (rev 19275)
@@ -57,6 +57,10 @@
     DIRS += binreloc
 endif
 
+ifeq ($(WITH_OPENJPEG), true)
+    DIRS += libopenjpeg
+endif
+
 TARGET = solid
 
 all::

Modified: branches/etch-a-ton/extern/SConscript
===================================================================
--- branches/etch-a-ton/extern/SConscript	2009-03-13 13:38:41 UTC (rev 19274)
+++ branches/etch-a-ton/extern/SConscript	2009-03-13 18:04:38 UTC (rev 19275)
@@ -5,8 +5,8 @@
 SConscript(['glew/SConscript'])
 
 if env['WITH_BF_GAMEENGINE']:
-    SConscript(['qhull/SConscript',
-            'solid/SConscript'])
+	if env['WITH_BF_SOLID']:
+		SConscript(['qhull/SConscript', 'solid/SConscript'])
 
 if env['WITH_BF_BULLET']:
     SConscript(['bullet2/src/SConscript'])

Modified: branches/etch-a-ton/extern/bullet2/make/msvc_9_0/Bullet.vcproj
===================================================================
--- branches/etch-a-ton/extern/bullet2/make/msvc_9_0/Bullet.vcproj	2009-03-13 13:38:41 UTC (rev 19274)
+++ branches/etch-a-ton/extern/bullet2/make/msvc_9_0/Bullet.vcproj	2009-03-13 18:04:38 UTC (rev 19275)
@@ -729,6 +729,14 @@
 					Name="CollisionDispatch"
 					>
 					<File
+						RelativePath="..\..\src\BulletCollision\CollisionDispatch\btActivatingCollisionAlgorithm.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\BulletCollision\CollisionDispatch\btActivatingCollisionAlgorithm.h"
+						>
+					</File>
+					<File
 						RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp"
 						>
 					</File>
@@ -825,6 +833,14 @@
 						>
 					</File>
 					<File
+						RelativePath="..\..\src\BulletCollision\CollisionDispatch\btGhostObject.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\BulletCollision\CollisionDispatch\btGhostObject.h"
+						>
+					</File>
+					<File
 						RelativePath="..\..\src\BulletCollision\CollisionDispatch\btManifoldResult.cpp"
 						>
 					</File>
@@ -961,6 +977,14 @@
 						>
 					</File>
 					<File
+						RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexPointCloudShape.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexPointCloudShape.h"
+						>
+					</File>
+					<File
 						RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexShape.cpp"
 						>
 					</File>

Modified: branches/etch-a-ton/extern/bullet2/src/Bullet-C-Api.h
===================================================================
--- branches/etch-a-ton/extern/bullet2/src/Bullet-C-Api.h	2009-03-13 13:38:41 UTC (rev 19274)
+++ branches/etch-a-ton/extern/bullet2/src/Bullet-C-Api.h	2009-03-13 18:04:38 UTC (rev 19275)
@@ -1,175 +1,175 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-/*
-	Draft high-level generic physics C-API. For low-level access, use the physics SDK native API's.
-	Work in progress, functionality will be added on demand.
-
-	If possible, use the richer Bullet C++ API, by including "btBulletDynamicsCommon.h"
-*/
-
-#ifndef BULLET_C_API_H
-#define BULLET_C_API_H
-
-#define PL_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
-
-#ifdef BT_USE_DOUBLE_PRECISION
-typedef double	plReal;
-#else
-typedef float	plReal;
-#endif
-
-typedef plReal	plVector3[3];
-typedef plReal	plQuaternion[4];
-
-#ifdef __cplusplus
-extern "C" { 
-#endif
-
-/*	Particular physics SDK */
-	PL_DECLARE_HANDLE(plPhysicsSdkHandle);
-
-/* 	Dynamics world, belonging to some physics SDK */
-	PL_DECLARE_HANDLE(plDynamicsWorldHandle);
-
-/* Rigid Body that can be part of a Dynamics World */	
-	PL_DECLARE_HANDLE(plRigidBodyHandle);
-
-/* 	Collision Shape/Geometry, property of a Rigid Body */
-	PL_DECLARE_HANDLE(plCollisionShapeHandle);
-
-/* Constraint for Rigid Bodies */
-	PL_DECLARE_HANDLE(plConstraintHandle);
-
-/* Triangle Mesh interface */
-	PL_DECLARE_HANDLE(plMeshInterfaceHandle);
-
-/* Broadphase Scene/Proxy Handles */
-	PL_DECLARE_HANDLE(plCollisionBroadphaseHandle);
-	PL_DECLARE_HANDLE(plBroadphaseProxyHandle);
-	PL_DECLARE_HANDLE(plCollisionWorldHandle);
-
-/*
-	Create and Delete a Physics SDK	
-*/
-
-	extern	plPhysicsSdkHandle	plNewBulletSdk(); //this could be also another sdk, like ODE, PhysX etc.
-	extern	void		plDeletePhysicsSdk(plPhysicsSdkHandle	physicsSdk);
-
-/* Collision World, not strictly necessary, you can also just create a Dynamics World with Rigid Bodies which internally manages the Collision World with Collision Objects */
-
-	typedef void(*btBroadphaseCallback)(void* clientData, void* object1,void* object2);
-
-	extern plCollisionBroadphaseHandle	plCreateSapBroadphase(btBroadphaseCallback beginCallback,btBroadphaseCallback endCallback);
-
-	extern void	plDestroyBroadphase(plCollisionBroadphaseHandle bp);
-
-	extern 	plBroadphaseProxyHandle plCreateProxy(plCollisionBroadphaseHandle bp, void* clientData, plReal minX,plReal minY,plReal minZ, plReal maxX,plReal maxY, plReal maxZ);
-
-	extern void plDestroyProxy(plCollisionBroadphaseHandle bp, plBroadphaseProxyHandle proxyHandle);
-
-	extern void plSetBoundingBox(plBroadphaseProxyHandle proxyHandle, plReal minX,plReal minY,plReal minZ, plReal maxX,plReal maxY, plReal maxZ);
-
-/* todo: add pair cache support with queries like add/remove/find pair */
-	
-	extern plCollisionWorldHandle plCreateCollisionWorld(plPhysicsSdkHandle physicsSdk);
-
-/* todo: add/remove objects */
-	
-
-/* Dynamics World */
-
-	extern  plDynamicsWorldHandle plCreateDynamicsWorld(plPhysicsSdkHandle physicsSdk);
-
-	extern  void           plDeleteDynamicsWorld(plDynamicsWorldHandle world);
-
-	extern	void	plStepSimulation(plDynamicsWorldHandle,	plReal	timeStep);
-
-	extern  void plAddRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object);
-
-	extern  void plRemoveRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object);
-
-
-/* Rigid Body  */
-
-	extern  plRigidBodyHandle plCreateRigidBody(	void* user_data,  float mass, plCollisionShapeHandle cshape );
-
-	extern  void plDeleteRigidBody(plRigidBodyHandle body);
-
-
-/* Collision Shape definition */
-
-	extern  plCollisionShapeHandle plNewSphereShape(plReal radius);
-	extern  plCollisionShapeHandle plNewBoxShape(plReal x, plReal y, plReal z);
-	extern  plCollisionShapeHandle plNewCapsuleShape(plReal radius, plReal height);	
-	extern  plCollisionShapeHandle plNewConeShape(plReal radius, plReal height);
-	extern  plCollisionShapeHandle plNewCylinderShape(plReal radius, plReal height);
-	extern	plCollisionShapeHandle plNewCompoundShape();
-	extern	void	plAddChildShape(plCollisionShapeHandle compoundShape,plCollisionShapeHandle childShape, plVector3 childPos,plQuaternion childOrn);
-

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list