[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47748] branches/soc-2012-bratwurst: merge with trunk -r47747

Antony Riakiotakis kalast at gmail.com
Mon Jun 11 19:06:26 CEST 2012


Revision: 47748
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47748
Author:   psy-fi
Date:     2012-06-11 17:06:17 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
merge with trunk -r47747

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47747

Modified Paths:
--------------
    branches/soc-2012-bratwurst/CMakeLists.txt
    branches/soc-2012-bratwurst/doc/python_api/sphinx_doc_gen.py
    branches/soc-2012-bratwurst/doc/python_api/sphinx_doc_gen.sh
    branches/soc-2012-bratwurst/extern/bullet2/CMakeLists.txt
    branches/soc-2012-bratwurst/extern/bullet2/readme.txt
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionMargin.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/Character/btCharacterControllerInterface.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/btSoftBody.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/btSoftBodySolvers.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btAabbUtil2.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btConvexHull.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btDefaultMotionState.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btHashMap.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btIDebugDraw.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btList.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btMinMax.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btPoolAllocator.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btQuadWord.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btQuaternion.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btQuickprof.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btQuickprof.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btRandom.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btScalar.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btSerializer.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btSerializer.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btTransform.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btTransformUtil.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btVector3.h
    branches/soc-2012-bratwurst/extern/bullet2/src/SConscript
    branches/soc-2012-bratwurst/extern/bullet2/src/btBulletDynamicsCommon.h
    branches/soc-2012-bratwurst/extern/eltopo/eltopo3d/dynamicsurface.h
    branches/soc-2012-bratwurst/extern/libmv/CMakeLists.txt
    branches/soc-2012-bratwurst/extern/libmv/SConscript
    branches/soc-2012-bratwurst/extern/libmv/bundle.sh
    branches/soc-2012-bratwurst/extern/libmv/libmv/image/sample.h
    branches/soc-2012-bratwurst/extern/libmv/libmv/tracking/esm_region_tracker.cc
    branches/soc-2012-bratwurst/extern/libmv/libmv-capi.cpp
    branches/soc-2012-bratwurst/extern/libmv/libmv-capi.h
    branches/soc-2012-bratwurst/extern/libmv/mkfiles.sh
    branches/soc-2012-bratwurst/intern/cycles/app/cycles_test.cpp
    branches/soc-2012-bratwurst/intern/cycles/app/cycles_xml.cpp
    branches/soc-2012-bratwurst/intern/cycles/blender/CMakeLists.txt
    branches/soc-2012-bratwurst/intern/cycles/blender/blender_camera.cpp
    branches/soc-2012-bratwurst/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2012-bratwurst/intern/cycles/blender/blender_object.cpp
    branches/soc-2012-bratwurst/intern/cycles/blender/blender_python.cpp
    branches/soc-2012-bratwurst/intern/cycles/blender/blender_session.cpp
    branches/soc-2012-bratwurst/intern/cycles/blender/blender_shader.cpp
    branches/soc-2012-bratwurst/intern/cycles/blender/blender_sync.cpp
    branches/soc-2012-bratwurst/intern/cycles/blender/blender_sync.h
    branches/soc-2012-bratwurst/intern/cycles/blender/blender_util.h
    branches/soc-2012-bratwurst/intern/cycles/bvh/bvh.cpp
    branches/soc-2012-bratwurst/intern/cycles/bvh/bvh.h
    branches/soc-2012-bratwurst/intern/cycles/bvh/bvh_binning.cpp
    branches/soc-2012-bratwurst/intern/cycles/bvh/bvh_build.cpp
    branches/soc-2012-bratwurst/intern/cycles/bvh/bvh_node.cpp
    branches/soc-2012-bratwurst/intern/cycles/bvh/bvh_params.h
    branches/soc-2012-bratwurst/intern/cycles/bvh/bvh_sort.h
    branches/soc-2012-bratwurst/intern/cycles/device/device.cpp
    branches/soc-2012-bratwurst/intern/cycles/device/device_cpu.cpp
    branches/soc-2012-bratwurst/intern/cycles/device/device_cuda.cpp
    branches/soc-2012-bratwurst/intern/cycles/device/device_network.h
    branches/soc-2012-bratwurst/intern/cycles/device/device_opencl.cpp
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_accumulate.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_bvh.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_compat_cpu.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_differential.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_emission.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_globals.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_light.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_montecarlo.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_object.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_optimized.cpp
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_path.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_projection.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_random.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_textures.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_triangle.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_types.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/osl/nodes/node_fresnel.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/osl/osl_services.cpp
    branches/soc-2012-bratwurst/intern/cycles/kernel/osl/osl_services.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/bsdf.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/bsdf_diffuse.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/bsdf_microfacet.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/bsdf_reflection.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/bsdf_refraction.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/bsdf_transparent.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/bsdf_ward.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/bsdf_westin.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/emissive.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_closure.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_geometry.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_gradient.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_image.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_magic.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_mix.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_musgrave.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_noise.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_texture.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_voronoi.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_wave.h
    branches/soc-2012-bratwurst/intern/cycles/kernel/svm/volume.h
    branches/soc-2012-bratwurst/intern/cycles/render/attribute.cpp
    branches/soc-2012-bratwurst/intern/cycles/render/buffers.cpp
    branches/soc-2012-bratwurst/intern/cycles/render/buffers.h
    branches/soc-2012-bratwurst/intern/cycles/render/camera.cpp
    branches/soc-2012-bratwurst/intern/cycles/render/camera.h
    branches/soc-2012-bratwurst/intern/cycles/render/film.cpp
    branches/soc-2012-bratwurst/intern/cycles/render/filter.cpp
    branches/soc-2012-bratwurst/intern/cycles/render/graph.cpp
    branches/soc-2012-bratwurst/intern/cycles/render/image.cpp
    branches/soc-2012-bratwurst/intern/cycles/render/light.cpp
    branches/soc-2012-bratwurst/intern/cycles/render/mesh.cpp
    branches/soc-2012-bratwurst/intern/cycles/render/nodes.cpp
    branches/soc-2012-bratwurst/intern/cycles/render/nodes.h
    branches/soc-2012-bratwurst/intern/cycles/render/object.cpp
    branches/soc-2012-bratwurst/intern/cycles/render/object.h
    branches/soc-2012-bratwurst/intern/cycles/render/osl.cpp
    branches/soc-2012-bratwurst/intern/cycles/render/scene.h
    branches/soc-2012-bratwurst/intern/cycles/render/session.cpp
    branches/soc-2012-bratwurst/intern/cycles/render/shader.cpp
    branches/soc-2012-bratwurst/intern/cycles/render/shader.h
    branches/soc-2012-bratwurst/intern/cycles/render/svm.cpp
    branches/soc-2012-bratwurst/intern/cycles/subd/subd_build.cpp
    branches/soc-2012-bratwurst/intern/cycles/subd/subd_dice.cpp
    branches/soc-2012-bratwurst/intern/cycles/subd/subd_ring.cpp
    branches/soc-2012-bratwurst/intern/cycles/subd/subd_split.cpp
    branches/soc-2012-bratwurst/intern/cycles/util/util_color.h
    branches/soc-2012-bratwurst/intern/cycles/util/util_cuda.cpp
    branches/soc-2012-bratwurst/intern/cycles/util/util_cuda.h
    branches/soc-2012-bratwurst/intern/cycles/util/util_hash.h
    branches/soc-2012-bratwurst/intern/cycles/util/util_math.h
    branches/soc-2012-bratwurst/intern/cycles/util/util_md5.cpp
    branches/soc-2012-bratwurst/intern/cycles/util/util_md5.h
    branches/soc-2012-bratwurst/intern/cycles/util/util_opencl.cpp
    branches/soc-2012-bratwurst/intern/cycles/util/util_opencl.h
    branches/soc-2012-bratwurst/intern/cycles/util/util_path.cpp
    branches/soc-2012-bratwurst/intern/cycles/util/util_system.cpp
    branches/soc-2012-bratwurst/intern/cycles/util/util_task.cpp
    branches/soc-2012-bratwurst/intern/cycles/util/util_thread.h
    branches/soc-2012-bratwurst/intern/cycles/util/util_transform.cpp
    branches/soc-2012-bratwurst/intern/cycles/util/util_transform.h
    branches/soc-2012-bratwurst/intern/cycles/util/util_view.cpp
    branches/soc-2012-bratwurst/intern/itasc/kdl/frames.inl
    branches/soc-2012-bratwurst/intern/smoke/intern/WTURBULENCE.cpp
    branches/soc-2012-bratwurst/release/scripts/modules/bpy/utils.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_physics_cloth.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_physics_softbody.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_blender.h
    branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_gpencil.h
    branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_image.h
    branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mask.h
    branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_node.h
    branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/anim.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/armature.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/colortools.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/constraint.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/gpencil.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/image.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mask.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/multires.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/node.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/seqcache.c
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/tracking.c
    branches/soc-2012-bratwurst/source/blender/blenlib/BLI_boxpack2d.h
    branches/soc-2012-bratwurst/source/blender/blenlib/BLI_pbvh.h
    branches/soc-2012-bratwurst/source/blender/blenlib/BLI_string_cursor_utf8.h
    branches/soc-2012-bratwurst/source/blender/blenlib/BLI_threads.h
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/boxpack2d.c
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/fileops.c
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/pbvh.c
    branches/soc-2012-bratwurst/source/blender/blenlib/intern/threads.c
    branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_operators.c
    branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_mesh_conv.c
    branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_triangulate.c
    branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2012-bratwurst/source/blender/compositor/CMakeLists.txt
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_WorkScheduler.h
    branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_GroupNode.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MuteNode.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_SocketProxyNode.h
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehImageOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_FogGlowImageOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GammaOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MapUVOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MathBaseOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RotateOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TonemapOperation.cpp
    branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
    branches/soc-2012-bratwurst/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2012-bratwurst/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/animation/anim_filter.c
    branches/soc-2012-bratwurst/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2012-bratwurst/source/blender/editors/animation/keyframes_general.c
    branches/soc-2012-bratwurst/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2012-bratwurst/source/blender/editors/gpencil/editaction_gpencil.c
    branches/soc-2012-bratwurst/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2012-bratwurst/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2012-bratwurst/source/blender/editors/include/ED_anim_api.h
    branches/soc-2012-bratwurst/source/blender/editors/include/ED_gpencil.h
    branches/soc-2012-bratwurst/source/blender/editors/include/ED_keyframes_draw.h
    branches/soc-2012-bratwurst/source/blender/editors/include/ED_mask.h
    branches/soc-2012-bratwurst/source/blender/editors/include/ED_sequencer.h
    branches/soc-2012-bratwurst/source/blender/editors/include/ED_transform.h
    branches/soc-2012-bratwurst/source/blender/editors/include/UI_interface.h
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_draw.c
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c
    branches/soc-2012-bratwurst/source/blender/editors/mask/CMakeLists.txt
    branches/soc-2012-bratwurst/source/blender/editors/mask/mask_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/mask/mask_relationships.c
    branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_loopcut.c
    branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2012-bratwurst/source/blender/editors/object/object_relations.c
    branches/soc-2012-bratwurst/source/blender/editors/object/object_select.c
    branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2012-bratwurst/source/blender/editors/space_action/action_draw.c
    branches/soc-2012-bratwurst/source/blender/editors/space_action/action_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/space_action/action_select.c
    branches/soc-2012-bratwurst/source/blender/editors/space_action/space_action.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_buttons.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_dopesheet_draw.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_dopesheet_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_graph_draw.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_graph_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_intern.h
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_utils.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/space_clip.c
    branches/soc-2012-bratwurst/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/space_image/image_draw.c
    branches/soc-2012-bratwurst/source/blender/editors/space_image/image_intern.h
    branches/soc-2012-bratwurst/source/blender/editors/space_image/image_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/space_image/space_image.c
    branches/soc-2012-bratwurst/source/blender/editors/space_node/drawnode.c
    branches/soc-2012-bratwurst/source/blender/editors/space_node/node_draw.c
    branches/soc-2012-bratwurst/source/blender/editors/space_node/space_node.c
    branches/soc-2012-bratwurst/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2012-bratwurst/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2012-bratwurst/source/blender/editors/space_outliner/outliner_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/SConscript
    branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c
    branches/soc-2012-bratwurst/source/blender/editors/transform/transform.h
    branches/soc-2012-bratwurst/source/blender/editors/transform/transform_constraints.c
    branches/soc-2012-bratwurst/source/blender/editors/transform/transform_conversions.c
    branches/soc-2012-bratwurst/source/blender/editors/transform/transform_generics.c
    branches/soc-2012-bratwurst/source/blender/editors/transform/transform_input.c
    branches/soc-2012-bratwurst/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2012-bratwurst/source/blender/editors/transform/transform_ops.c
    branches/soc-2012-bratwurst/source/blender/editors/transform/transform_orientations.c
    branches/soc-2012-bratwurst/source/blender/editors/transform/transform_snap.c
    branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2012-bratwurst/source/blender/gpu/GPU_draw.h
    branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2012-bratwurst/source/blender/imbuf/intern/divers.c
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_action_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_color_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_mask_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_movieclip_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_object_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_space_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2012-bratwurst/source/blender/makesrna/RNA_access.h
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/makesrna.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_access.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_color.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_define.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_mask.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_movieclip.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_object.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_space.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2012-bratwurst/source/blender/nodes/CMakeLists.txt
    branches/soc-2012-bratwurst/source/blender/nodes/NOD_shader.h
    branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
    branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
    branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_boxmask.c
    branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
    branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_switch.c
    branches/soc-2012-bratwurst/source/blender/nodes/intern/node_common.c
    branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_utils.c
    branches/soc-2012-bratwurst/source/blender/python/intern/bpy_interface.c
    branches/soc-2012-bratwurst/source/blender/python/intern/bpy_rna.c
    branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2012-bratwurst/source/blenderplayer/CMakeLists.txt
    branches/soc-2012-bratwurst/source/creator/CMakeLists.txt
    branches/soc-2012-bratwurst/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_NearSensor.h
    branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/soc-2012-bratwurst/source/gameengine/VideoTexture/ImageBase.cpp
    branches/soc-2012-bratwurst/source/tools/check_style_c.py

Added Paths:
-----------
    branches/soc-2012-bratwurst/extern/bullet2/patches/ghost_softbody.patch
    branches/soc-2012-bratwurst/extern/bullet2/patches/pvs_warning_fixes.patch
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btConvexHullComputer.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btConvexHullComputer.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btGrahamScan2dConvexHull.h
    branches/soc-2012-bratwurst/extern/libmv/libmv/multiview/homography.cc
    branches/soc-2012-bratwurst/extern/libmv/libmv/multiview/homography.h
    branches/soc-2012-bratwurst/extern/libmv/libmv/multiview/homography_parameterization.h
    branches/soc-2012-bratwurst/extern/libmv/libmv/tracking/track_region.cc
    branches/soc-2012-bratwurst/extern/libmv/libmv/tracking/track_region.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/CMakeLists.txt
    branches/soc-2012-bratwurst/extern/libmv/third_party/SConscript
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/CMakeLists.txt
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/ChangeLog
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/LICENSE
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/README
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/SConscript
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/bundle.sh
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/files.txt
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/autodiff_cost_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/ceres.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/conditioned_cost_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/cost_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/autodiff.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/eigen.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/macros.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/manual_constructor.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/port.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/scoped_ptr.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/iteration_callback.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/jet.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/local_parameterization.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/loss_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/normal_prior.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/numeric_diff_cost_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/problem.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/rotation.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/sized_cost_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/types.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_structure.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_structure.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/casts.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/cgnr_linear_operator.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/conditioned_cost_function.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/corrector.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/corrector.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/dense_jacobian_writer.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/detect_structure.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/detect_structure.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/evaluator.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/evaluator.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/file.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/file.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/graph.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/graph_algorithms.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/integral_types.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/linear_operator.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/linear_operator.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/linear_solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/local_parameterization.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/loss_function.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/map_util.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/matrix_proto.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/minimizer.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/mutex.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/normal_prior.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/parameter_block.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/problem.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/problem_impl.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/program.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/program.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/random.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/residual_block.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/runtime_numeric_diff_cost_function.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/runtime_numeric_diff_cost_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/schur_ordering.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/schur_ordering.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/solver_impl.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/split.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/stl_util.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/stringprintf.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/suitesparse.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/types.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/visibility.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/visibility.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/mkfiles.sh
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/patches/
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/patches/msvc_isfinite.patch
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/patches/series
    branches/soc-2012-bratwurst/intern/cycles/blender/blender_particles.cpp
    branches/soc-2012-bratwurst/release/scripts/templates/operator_node.py
    branches/soc-2012-bratwurst/source/blender/editors/mask/mask_editaction.c
    branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_particle_info.c

Removed Paths:
-------------
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletCollision/Jamfile
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletDynamics/Jamfile
    branches/soc-2012-bratwurst/extern/bullet2/src/BulletSoftBody/Jamfile
    branches/soc-2012-bratwurst/extern/bullet2/src/Jamfile
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/Jamfile
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btPoint3.h
    branches/soc-2012-bratwurst/extern/bullet2/src/LinearMath/btSimdMinMax.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/CMakeLists.txt
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/ChangeLog
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/LICENSE
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/README
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/SConscript
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/bundle.sh
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/files.txt
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/autodiff_cost_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/ceres.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/conditioned_cost_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/cost_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/autodiff.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/eigen.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/macros.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/manual_constructor.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/port.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/internal/scoped_ptr.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/iteration_callback.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/jet.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/local_parameterization.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/loss_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/normal_prior.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/numeric_diff_cost_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/problem.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/rotation.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/sized_cost_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/include/ceres/types.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_structure.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/block_structure.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/casts.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/cgnr_linear_operator.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/conditioned_cost_function.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/corrector.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/corrector.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/dense_jacobian_writer.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/detect_structure.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/detect_structure.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/evaluator.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/evaluator.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/file.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/file.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/graph.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/graph_algorithms.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/integral_types.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/linear_operator.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/linear_operator.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/linear_solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/local_parameterization.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/loss_function.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/map_util.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/matrix_proto.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/minimizer.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/mutex.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/normal_prior.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/parameter_block.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/problem.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/problem_impl.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/program.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/program.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/random.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/residual_block.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/runtime_numeric_diff_cost_function.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/runtime_numeric_diff_cost_function.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/schur_ordering.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/schur_ordering.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/solver_impl.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/split.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/stl_util.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/stringprintf.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/suitesparse.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/types.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/visibility.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/visibility.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/mkfiles.sh
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/patches/
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/patches/msvc_isfinite.patch
    branches/soc-2012-bratwurst/extern/libmv/third_party/ceres/patches/series

Property Changed:
----------------
    branches/soc-2012-bratwurst/
    branches/soc-2012-bratwurst/extern/libmv/libmv/simple_pipeline/modal_solver.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/gflags/gflags.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/gflags/gflags_completions.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/gflags/gflags_reporting.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/glog/src/demangle.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/glog/src/logging.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/glog/src/raw_logging.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/glog/src/signalhandler.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/glog/src/symbolize.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/glog/src/utilities.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/glog/src/vlog_is_on.cc
    branches/soc-2012-bratwurst/extern/libmv/third_party/glog/src/windows/port.cc
    branches/soc-2012-bratwurst/release/datafiles/clkernelstoh.py
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
    branches/soc-2012-bratwurst/source/blender/editors/space_outliner/


Property changes on: branches/soc-2012-bratwurst
___________________________________________________________________
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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:46808-47608
   + /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:46808-47747

Modified: branches/soc-2012-bratwurst/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/CMakeLists.txt	2012-06-11 16:23:10 UTC (rev 47747)
+++ branches/soc-2012-bratwurst/CMakeLists.txt	2012-06-11 17:06:17 UTC (rev 47748)
@@ -1607,6 +1607,20 @@
 		ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
 	endif()
 
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts)
+
+	ADD_CHECK_C_COMPILER_FLAG(CXX_WARNINGS C_WARN_ALL -Wall)
+	ADD_CHECK_C_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare)
+	ADD_CHECK_C_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas)
+	ADD_CHECK_C_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts)
+	ADD_CHECK_C_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_OVERLOADED_VIRTUAL -Wno-overloaded-virtual)  # we get a lot of these, if its a problem a dev needs to look into it.
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
+
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)

Modified: branches/soc-2012-bratwurst/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2012-bratwurst/doc/python_api/sphinx_doc_gen.py	2012-06-11 16:23:10 UTC (rev 47747)
+++ branches/soc-2012-bratwurst/doc/python_api/sphinx_doc_gen.py	2012-06-11 17:06:17 UTC (rev 47748)
@@ -934,6 +934,8 @@
         "image_context_dir",
         "node_context_dir",
         "text_context_dir",
+        "clip_context_dir",
+        "sequencer_context_dir",
     )
 
     # Changes in blender will force errors here
@@ -943,6 +945,7 @@
         "active_object": ("Object", False),
         "active_operator": ("Operator", False),
         "active_pose_bone": ("PoseBone", False),
+        "active_node": ("Node", False),
         "armature": ("Armature", False),
         "bone": ("Bone", False),
         "brush": ("Brush", False),
@@ -953,6 +956,8 @@
         "dynamic_paint": ("DynamicPaintModifier", False),
         "edit_bone": ("EditBone", False),
         "edit_image": ("Image", False),
+        "edit_mask": ("Mask", False),
+        "edit_movieclip": ("MovieClip", False),
         "edit_object": ("Object", False),
         "edit_text": ("Text", False),
         "editable_bones": ("EditBone", True),

Modified: branches/soc-2012-bratwurst/doc/python_api/sphinx_doc_gen.sh
===================================================================
--- branches/soc-2012-bratwurst/doc/python_api/sphinx_doc_gen.sh	2012-06-11 16:23:10 UTC (rev 47747)
+++ branches/soc-2012-bratwurst/doc/python_api/sphinx_doc_gen.sh	2012-06-11 17:06:17 UTC (rev 47748)
@@ -61,7 +61,7 @@
 
 	# annoying bug in sphinx makes it very slow unless we do this. should report.
 	cd $SPHINXBASE
-	sphinx-build -n -b html sphinx-in sphinx-out
+	sphinx-build -b html sphinx-in sphinx-out
 
 	# XXX, saves space on upload and zip, should move HTML outside
 	# and zip up there, for now this is OK

Modified: branches/soc-2012-bratwurst/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/extern/bullet2/CMakeLists.txt	2012-06-11 16:23:10 UTC (rev 47747)
+++ branches/soc-2012-bratwurst/extern/bullet2/CMakeLists.txt	2012-06-11 17:06:17 UTC (rev 47748)
@@ -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

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list