[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47624] branches/soc-2011-tomato: Merging r47612 through r47623 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Fri Jun 8 20:25:13 CEST 2012
Revision: 47624
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47624
Author: nazgul
Date: 2012-06-08 18:25:01 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
Merging r47612 through r47623 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47612
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47623
Modified Paths:
--------------
branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt
branches/soc-2011-tomato/extern/bullet2/readme.txt
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionMargin.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Character/btCharacterControllerInterface.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftBodySolvers.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btAabbUtil2.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btConvexHull.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btDefaultMotionState.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btHashMap.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btIDebugDraw.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btList.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btMinMax.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btPoolAllocator.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btQuadWord.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btQuaternion.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btQuickprof.cpp
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btQuickprof.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btRandom.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btScalar.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btSerializer.cpp
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btSerializer.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btTransform.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btTransformUtil.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btVector3.h
branches/soc-2011-tomato/extern/bullet2/src/SConscript
branches/soc-2011-tomato/extern/bullet2/src/btBulletDynamicsCommon.h
branches/soc-2011-tomato/intern/cycles/blender/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_shader.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_sync.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_object.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_textures.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_geometry.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_types.h
branches/soc-2011-tomato/intern/cycles/render/nodes.cpp
branches/soc-2011-tomato/intern/cycles/render/nodes.h
branches/soc-2011-tomato/intern/cycles/render/object.cpp
branches/soc-2011-tomato/intern/cycles/render/object.h
branches/soc-2011-tomato/intern/cycles/render/scene.h
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_softbody.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/editors/object/object_select.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_dopesheet_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-tomato/source/blender/nodes/CMakeLists.txt
branches/soc-2011-tomato/source/blender/nodes/NOD_shader.h
Added Paths:
-----------
branches/soc-2011-tomato/extern/bullet2/patches/ghost_softbody.patch
branches/soc-2011-tomato/extern/bullet2/patches/pvs_warning_fixes.patch
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btConvexHullComputer.cpp
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btConvexHullComputer.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btGrahamScan2dConvexHull.h
branches/soc-2011-tomato/intern/cycles/blender/blender_particles.cpp
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_particle_info.c
Removed Paths:
-------------
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Jamfile
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Jamfile
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/Jamfile
branches/soc-2011-tomato/extern/bullet2/src/Jamfile
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/Jamfile
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btPoint3.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btSimdMinMax.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-47611
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-47623
Modified: branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt 2012-06-08 18:16:20 UTC (rev 47623)
+++ branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt 2012-06-08 18:25:01 UTC (rev 47624)
@@ -43,9 +43,9 @@
src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
- src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp
src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
+ src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
@@ -54,16 +54,21 @@
src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
+ src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp
src/BulletCollision/CollisionDispatch/btGhostObject.cpp
+ src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
+ src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
src/BulletCollision/CollisionDispatch/btUnionFind.cpp
+ src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
src/BulletCollision/CollisionShapes/btBoxShape.cpp
+ src/BulletCollision/CollisionShapes/btBox2dShape.cpp
src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
src/BulletCollision/CollisionShapes/btCollisionShape.cpp
@@ -73,14 +78,16 @@
src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
+ src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp
src/BulletCollision/CollisionShapes/btConvexShape.cpp
+ src/BulletCollision/CollisionShapes/btConvex2dShape.cpp
src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
src/BulletCollision/CollisionShapes/btCylinderShape.cpp
src/BulletCollision/CollisionShapes/btEmptyShape.cpp
src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
+ src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
- src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
@@ -97,11 +104,11 @@
src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
src/BulletCollision/Gimpact/btContactProcessing.cpp
+ src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
src/BulletCollision/Gimpact/btGImpactBvh.cpp
src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
src/BulletCollision/Gimpact/btGImpactShape.cpp
- src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
src/BulletCollision/Gimpact/gim_box_set.cpp
src/BulletCollision/Gimpact/gim_contact.cpp
@@ -118,25 +125,28 @@
src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
- src/BulletDynamics/Character/btKinematicCharacterController.cpp
+ src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
+
src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
+ src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp
src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp
src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
- src/BulletDynamics/Dynamics/Bullet-C-API.cpp
- src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
+ src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
src/BulletDynamics/Dynamics/btRigidBody.cpp
src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
+ src/BulletDynamics/Dynamics/Bullet-C-API.cpp
src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
src/BulletDynamics/Vehicle/btWheelInfo.cpp
- src/BulletSoftBody/btDefaultSoftBodySolver.cpp
+ src/BulletDynamics/Character/btKinematicCharacterController.cpp
+
src/BulletSoftBody/btSoftBody.cpp
src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
src/BulletSoftBody/btSoftBodyHelpers.cpp
@@ -144,21 +154,16 @@
src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
+ src/BulletSoftBody/btDefaultSoftBodySolver.cpp
+
src/LinearMath/btAlignedAllocator.cpp
src/LinearMath/btConvexHull.cpp
+ src/LinearMath/btConvexHullComputer.cpp
src/LinearMath/btGeometryUtil.cpp
src/LinearMath/btQuickprof.cpp
src/LinearMath/btSerializer.cpp
- # UNUSED
- # src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
- # src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
- # src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
- # src/BulletCollision/CollisionShapes/btBox2dShape.cpp
- # src/BulletCollision/CollisionShapes/btConvex2dShape.cpp
- # src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp
- # src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
-
- src/Bullet-C-Api.h
+
+
src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
@@ -171,9 +176,9 @@
src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
- src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
+ src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
@@ -183,6 +188,7 @@
src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
+ src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
@@ -193,7 +199,9 @@
src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
src/BulletCollision/CollisionDispatch/btUnionFind.h
+ src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
src/BulletCollision/CollisionShapes/btBoxShape.h
+ src/BulletCollision/CollisionShapes/btBox2dShape.h
src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
src/BulletCollision/CollisionShapes/btCapsuleShape.h
src/BulletCollision/CollisionShapes/btCollisionMargin.h
@@ -204,15 +212,17 @@
src/BulletCollision/CollisionShapes/btConvexHullShape.h
src/BulletCollision/CollisionShapes/btConvexInternalShape.h
src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h
+ src/BulletCollision/CollisionShapes/btConvexPolyhedron.h
src/BulletCollision/CollisionShapes/btConvexShape.h
+ src/BulletCollision/CollisionShapes/btConvex2dShape.h
src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
src/BulletCollision/CollisionShapes/btCylinderShape.h
src/BulletCollision/CollisionShapes/btEmptyShape.h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list