[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47706] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 47700.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sun Jun 10 22:50:52 CEST 2012


Revision: 47706
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47706
Author:   kjym3
Date:     2012-06-10 20:50:43 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 47700.

Conflicts resolved:
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/WM_types.h

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
    branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt
    branches/soc-2008-mxcurioni/extern/bullet2/readme.txt
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionMargin.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Character/btCharacterControllerInterface.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBody.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodySolvers.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btAabbUtil2.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btConvexHull.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btDefaultMotionState.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btHashMap.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btIDebugDraw.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btList.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btMinMax.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btPoolAllocator.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btQuadWord.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btQuaternion.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btQuickprof.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btQuickprof.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btRandom.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btScalar.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btSerializer.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btSerializer.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btTransform.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btTransformUtil.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btVector3.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/SConscript
    branches/soc-2008-mxcurioni/extern/bullet2/src/btBulletDynamicsCommon.h
    branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt
    branches/soc-2008-mxcurioni/extern/libmv/SConscript
    branches/soc-2008-mxcurioni/extern/libmv/bundle.sh
    branches/soc-2008-mxcurioni/extern/libmv/libmv/image/sample.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/esm_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv-capi.cpp
    branches/soc-2008-mxcurioni/extern/libmv/libmv-capi.h
    branches/soc-2008-mxcurioni/extern/libmv/mkfiles.sh
    branches/soc-2008-mxcurioni/intern/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/SConscript
    branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
    branches/soc-2008-mxcurioni/intern/container/CTR_UHeap.h
    branches/soc-2008-mxcurioni/intern/container/intern/CTR_List.cpp
    branches/soc-2008-mxcurioni/intern/cycles/app/cycles_test.cpp
    branches/soc-2008-mxcurioni/intern/cycles/app/cycles_xml.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_camera.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_object.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_python.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.h
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_util.h
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh.cpp
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh.h
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_binning.cpp
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_build.cpp
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_node.cpp
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_params.h
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_sort.h
    branches/soc-2008-mxcurioni/intern/cycles/device/device.cpp
    branches/soc-2008-mxcurioni/intern/cycles/device/device_cpu.cpp
    branches/soc-2008-mxcurioni/intern/cycles/device/device_cuda.cpp
    branches/soc-2008-mxcurioni/intern/cycles/device/device_network.h
    branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_accumulate.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_bvh.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_cpu.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_differential.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_emission.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_globals.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_light.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_montecarlo.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_object.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_optimized.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_path.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_projection.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_random.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_shader.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_textures.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_triangle.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/background.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_diffuse.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_microfacet.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_reflection.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_refraction.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_transparent.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_ward.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_westin.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bssrdf.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/debug.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/emissive.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_color.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_fresnel.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_texture.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/stdosl.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_closures.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_services.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_services.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_shader.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_shader.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/vol_subsurface.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_diffuse.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_microfacet.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_reflection.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_refraction.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_transparent.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_ward.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_westin.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/emissive.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_closure.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_geometry.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_gradient.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_image.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_magic.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_mix.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_musgrave.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_noise.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_texture.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_voronoi.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_wave.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/volume.h
    branches/soc-2008-mxcurioni/intern/cycles/render/attribute.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/buffers.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/buffers.h
    branches/soc-2008-mxcurioni/intern/cycles/render/camera.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/camera.h
    branches/soc-2008-mxcurioni/intern/cycles/render/film.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/filter.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/graph.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/image.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/light.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/light.h
    branches/soc-2008-mxcurioni/intern/cycles/render/mesh.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/nodes.h
    branches/soc-2008-mxcurioni/intern/cycles/render/object.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/object.h
    branches/soc-2008-mxcurioni/intern/cycles/render/osl.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/scene.h
    branches/soc-2008-mxcurioni/intern/cycles/render/session.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/shader.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/shader.h
    branches/soc-2008-mxcurioni/intern/cycles/render/svm.cpp
    branches/soc-2008-mxcurioni/intern/cycles/subd/subd_build.cpp
    branches/soc-2008-mxcurioni/intern/cycles/subd/subd_dice.cpp
    branches/soc-2008-mxcurioni/intern/cycles/subd/subd_ring.cpp
    branches/soc-2008-mxcurioni/intern/cycles/subd/subd_split.cpp
    branches/soc-2008-mxcurioni/intern/cycles/util/util_color.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_cuda.cpp
    branches/soc-2008-mxcurioni/intern/cycles/util/util_cuda.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_hash.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_math.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_md5.cpp
    branches/soc-2008-mxcurioni/intern/cycles/util/util_md5.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_opencl.cpp
    branches/soc-2008-mxcurioni/intern/cycles/util/util_opencl.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_path.cpp
    branches/soc-2008-mxcurioni/intern/cycles/util/util_system.cpp
    branches/soc-2008-mxcurioni/intern/cycles/util/util_task.cpp
    branches/soc-2008-mxcurioni/intern/cycles/util/util_thread.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.cpp
    branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_view.cpp
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerNULL.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowNULL.h
    branches/soc-2008-mxcurioni/intern/ghost/test/multitest/EventToBuf.c
    branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
    branches/soc-2008-mxcurioni/intern/itasc/Armature.cpp
    branches/soc-2008-mxcurioni/intern/itasc/Armature.hpp
    branches/soc-2008-mxcurioni/intern/itasc/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/itasc/Distance.cpp
    branches/soc-2008-mxcurioni/intern/itasc/FixedObject.cpp
    branches/soc-2008-mxcurioni/intern/itasc/FixedObject.hpp
    branches/soc-2008-mxcurioni/intern/itasc/MovingFrame.cpp
    branches/soc-2008-mxcurioni/intern/itasc/MovingFrame.hpp
    branches/soc-2008-mxcurioni/intern/itasc/Object.hpp
    branches/soc-2008-mxcurioni/intern/itasc/SConscript
    branches/soc-2008-mxcurioni/intern/itasc/Scene.cpp
    branches/soc-2008-mxcurioni/intern/itasc/kdl/jntarray.cpp
    branches/soc-2008-mxcurioni/intern/itasc/kdl/jntarray.hpp
    branches/soc-2008-mxcurioni/intern/itasc/kdl/joint.cpp
    branches/soc-2008-mxcurioni/intern/itasc/kdl/joint.hpp
    branches/soc-2008-mxcurioni/intern/itasc/kdl/kinfam_io.cpp
    branches/soc-2008-mxcurioni/intern/itasc/kdl/segment.cpp
    branches/soc-2008-mxcurioni/intern/itasc/kdl/segment.hpp
    branches/soc-2008-mxcurioni/intern/itasc/kdl/utilities/utility.h
    branches/soc-2008-mxcurioni/intern/memutil/MEM_Allocator.h
    branches/soc-2008-mxcurioni/intern/memutil/MEM_RefCountPtr.h
    branches/soc-2008-mxcurioni/intern/memutil/MEM_SmartPtr.h
    branches/soc-2008-mxcurioni/intern/mikktspace/mikktspace.c
    branches/soc-2008-mxcurioni/intern/mikktspace/mikktspace.h
    branches/soc-2008-mxcurioni/intern/utfconv/utfconv.c
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/keyconfig_utils.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_object.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_cloth.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_softbody.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_console.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cloth.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_collision.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_context.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_gpencil.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_main.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_movieclip.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_paint.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sketch.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/context.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/editderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/gpencil.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idcode.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/implicit.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/navmesh_conversion.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/paint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/tracking.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_boxpack2d.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_pbvh.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string_cursor_utf8.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_threads.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/boxpack2d.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/freetypefont.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color_inline.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/pbvh.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string_utf8.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/threads.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/versioning_250.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/versioning_legacy.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_mesh_conv.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_triangulate.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ExportSettings.h
    branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/SceneExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada.h
    branches/soc-2008-mxcurioni/source/blender/collada/collada_utils.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada_utils.h
    branches/soc-2008-mxcurioni/source/blender/compositor/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/compositor/COM_defines.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_Converter.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionSystem.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_Node.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_Node.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_NodeOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_NodeOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_OpenCLDevice.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_WorkScheduler.h
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BokehImageNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_CompositorNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_FilterNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_GroupNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_MixNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_MovieClipNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_OutputFileNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_SocketProxyNode.h
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_TextureNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ViewerNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BokehBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BokehImageOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorCurveOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CompositorOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_FogGlowImageOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GammaOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ImageOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MapUVOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MathBaseOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_OpenCLKernels.cl
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_OutputFileOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_PreviewOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_PreviewOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_RotateOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_TonemapOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ViewerBaseOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_WriteBufferOperation.h
    branches/soc-2008-mxcurioni/source/blender/editors/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_general.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_retarget.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/lorem.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/editaction_gpencil.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_clip.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_gpencil.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframes_draw.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_transform.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loopcut.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_lattice.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_hide.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_mask.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/space_action.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_api/spacetypes.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_texture.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_dopesheet_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_dopesheet_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_graph_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_graph_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/space_clip.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/space_console.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.h
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
    branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/soc-2008-mxcurioni/source/blender/ikplugin/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/ikplugin/SConscript
    branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/ColorBlock.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_cloth_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_color_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_image_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_listBase.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_movieclip_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_cloth.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_movieclip.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_smoke.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_remesh.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smooth.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/nodes/NOD_composite.h
    branches/soc-2008-mxcurioni/source/blender/nodes/NOD_shader.h
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.h
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_boxmask.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_switch.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_common.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_utils.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_library.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_shader_ext.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/render_types.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/rendercore.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/sunsky.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/voxeldata.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/zbuf.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_instance.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/envmap.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pointdensity.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/volumetric.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/voxeldata.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2008-mxcurioni/source/blenderplayer/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/Value.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_JoystickSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/blender_plugin_types.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_LightIpoSGController.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MaterialIpoController.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_NearSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_WorldIpoController.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_LightObject.h
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_ParentRelation.h
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/FilterColor.h
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageBase.cpp
    branches/soc-2008-mxcurioni/source/tools/check_style_c.py

Added Paths:
-----------
    branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Object.py
    branches/soc-2008-mxcurioni/extern/bullet2/patches/ghost_softbody.patch
    branches/soc-2008-mxcurioni/extern/bullet2/patches/pvs_warning_fixes.patch
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btConvexHullComputer.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btConvexHullComputer.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btGrahamScan2dConvexHull.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/homography.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/homography.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/homography_parameterization.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/track_region.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/track_region.h
    branches/soc-2008-mxcurioni/extern/libmv/third_party/CMakeLists.txt
    branches/soc-2008-mxcurioni/extern/libmv/third_party/SConscript
    branches/soc-2008-mxcurioni/extern/libmv/third_party/ceres/
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_particles.cpp
    branches/soc-2008-mxcurioni/intern/raskter/
    branches/soc-2008-mxcurioni/release/datafiles/clkernelstoh.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mask.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mask.c
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_MaskNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_MaskNode.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MaskOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MaskOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mask.h
    branches/soc-2008-mxcurioni/source/blender/editors/mask/
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mask_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mask.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mask.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_particle_info.c

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Jamfile
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Jamfile
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/Jamfile
    branches/soc-2008-mxcurioni/extern/bullet2/src/Jamfile
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/Jamfile
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btPoint3.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/LinearMath/btSimdMinMax.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_OpenCLKernels.cl.cpp

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
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:34011-39896,39898-40096,40098-44221,44223-44419,44421-47381
   + /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:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-47700

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2012-06-10 20:31:01 UTC (rev 47705)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2012-06-10 20:50:43 UTC (rev 47706)
@@ -236,6 +236,7 @@
 # Cycles
 option(WITH_CYCLES					"Enable cycles Render Engine" ON)
 option(WITH_CYCLES_TEST				"Build cycles test application" OFF)
+option(WITH_CYCLES_OSL				"Build Cycles with OSL support" OFF)
 option(WITH_CYCLES_CUDA_BINARIES	"Build cycles CUDA binaries" OFF)
 set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
@@ -646,10 +647,17 @@
 
 		find_package(OpenImageIO)
 
-		set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
+		set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
 		set(OPENIMAGEIO_LIBPATH)  # TODO, remove and reference the absolute path everywhere
 		set(OPENIMAGEIO_DEFINITIONS)
 
+		if(WITH_IMAGE_TIFF)
+			list(APPEND OPENIMAGEIO_LIBRARIES "${TIFF_LIBRARY}")
+		endif()
+		if(WITH_IMAGE_OPENEXR)
+			list(APPEND OPENIMAGEIO_LIBRARIES "${OPENEXR_LIBRARIES}")
+		endif()
+
 		if(NOT OPENIMAGEIO_FOUND)
 			set(WITH_OPENIMAGEIO OFF)
 			set(WITH_CYCLES OFF)

Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py	2012-06-10 20:31:01 UTC (rev 47705)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py	2012-06-10 20:50:43 UTC (rev 47706)
@@ -97,6 +97,7 @@
 # Cycles
 WITH_BF_CYCLES = True
 WITH_BF_CYCLES_CUDA_BINARIES = True
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
 
 WITH_BF_OIIO = True
 WITH_BF_STATICOIIO = True

Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py	2012-06-10 20:31:01 UTC (rev 47705)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py	2012-06-10 20:50:43 UTC (rev 47706)
@@ -97,6 +97,7 @@
 # Cycles
 WITH_BF_CYCLES = True
 WITH_BF_CYCLES_CUDA_BINARIES = True
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
 
 WITH_BF_OIIO = True
 WITH_BF_STATICOIIO = True

Copied: branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Object.py (from rev 47664, trunk/blender/doc/python_api/examples/bpy.types.Object.py)
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Object.py	                        (rev 0)
+++ branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Object.py	2012-06-10 20:50:43 UTC (rev 47706)
@@ -0,0 +1,27 @@
+"""
+Basic Object Operations Example
++++++++++++++++++++++++++++++++
+This script demonstrates basic operations on object like creating new
+object, placing it into scene, selecting it and making it active
+"""
+
+import bpy
+from mathutils import Matrix
+
+scene = bpy.context.scene
+
+# Create new lamp datablock
+lamp_data = bpy.data.lamps.new(name="New Lamp", type="POINT")
+
+# Create new object with out lamp datablock
+lamp_object = bpy.data.objects.new(name="New Lamp", object_data=lamp_data)
+
+# Link lamp object to the scene so it'll appear in this scene
+scene.objects.link(lamp_object)
+
+# Place lamp to specified location
+lamp_object.location = (5.0, 5.0, 5.0)
+
+# And finally select it make active
+lamp_object.select = True
+scene.objects.active = lamp_object

Modified: branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt	2012-06-10 20:31:01 UTC (rev 47705)
+++ branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt	2012-06-10 20:50:43 UTC (rev 47706)
@@ -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

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list