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

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sun Mar 13 03:10:41 CET 2011


Revision: 35506
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35506
Author:   kjym3
Date:     2011-03-13 02:10:39 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 35505.

Conflicts resolved:
source/blender/makesdna/DNA_material_types.h

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/GNUmakefile
    branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake
    branches/soc-2008-mxcurioni/build_files/package_spec/debian/rules
    branches/soc-2008-mxcurioni/build_files/package_spec/pacman/PKGBUILD
    branches/soc-2008-mxcurioni/build_files/scons/config/aix4-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/irix6-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/linux2-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/linuxcross-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/openbsd3-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/sunos5-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
    branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt
    branches/soc-2008-mxcurioni/extern/bullet2/src/Bullet-C-Api.h
    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.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
    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.cpp
    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.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
    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/btGhostObject.h
    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/btSphereTriangleCollisionAlgorithm.cpp
    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/btBoxShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
    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/btCapsuleShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionMargin.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.cpp
    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.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.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.cpp
    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.cpp
    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.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
    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.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
    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.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
    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/CollisionShapes/btUniformScalingShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btClipPolygon.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btGImpactMassUtil.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btGeometryOperations.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_array.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_bitset.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_box_collision.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_clip_polygon.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_geom_types.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_geometry.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_hash_table.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_linear_math.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_math.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
    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/btGjkEpa2.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
    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.cpp
    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.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.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/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/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.cpp
    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.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.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/Dynamics/Bullet-C-API.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Dynamics/btActionInterface.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
    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.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.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/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/btSoftRigidCollisionAlgorithm.cpp
    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.cpp
    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.cpp
    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/btMatrix3x3.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/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/btScalar.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/btBulletCollisionCommon.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/btBulletDynamicsCommon.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2008-mxcurioni/intern/mikktspace/mikktspace.c
    branches/soc-2008-mxcurioni/release/freedesktop/blender.desktop
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
    branches/soc-2008-mxcurioni/release/scripts/modules/io_utils.py
    branches/soc-2008-mxcurioni/release/scripts/op/image.py
    branches/soc-2008-mxcurioni/release/scripts/op/screen_play_rendered_anim.py
    branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_follow_active.py
    branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_smart_project.py
    branches/soc-2008-mxcurioni/release/scripts/op/wm.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_bone.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lamp.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_mesh.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_metaball.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_game.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_material.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_field.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_fluid.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_dopesheet.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_outliner.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref_keymap.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_idcode.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_particle.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idcode.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idprop.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_readfile.h
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readblenentry.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.h
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_general.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_uvedit.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/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/space_file.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_userpref/space_userpref.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_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2008-mxcurioni/source/blender/gpu/GPU_extensions.h
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_material_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_view3d_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particlesystem.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smoke.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_subsurf.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_math.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_material.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_math.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_output.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_math.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_util.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.h
    branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_anim.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_util.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_util.h
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_shader_ext.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/bvh.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/vbvh.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/strand.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_cursors.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_cursors.h
    branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2008-mxcurioni/source/tests/pep8.py

Added Paths:
-----------
    branches/soc-2008-mxcurioni/build_files/cmake/FindPythonLibsUnix.cmake
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Character/
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Character/btCharacterControllerInterface.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.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.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.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/BulletSoftBody/btDefaultSoftBodySolver.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodyData.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodySolverVertexBuffer.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodySolvers.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/release/scripts/op/uvcalc_lightmap.py
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_library.c

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Character/btCharacterControllerInterface.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h
    branches/soc-2008-mxcurioni/release/scripts/op/uv.py

Property Changed:
----------------
    branches/soc-2008-mxcurioni/


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:34011-35367
   + /trunk/blender:34011-35505

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2011-03-13 01:15:14 UTC (rev 35505)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2011-03-13 02:10:39 UTC (rev 35506)
@@ -67,12 +67,12 @@
 get_blender_version()
 
 # Blender internal features
-option(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
-option(WITH_PYTHON        "Enable Embedded Python API" ON)
-option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency)." OFF)
-option(WITH_PYTHON_MODULE "Enable building as a python module (experemental)" OFF)
-option(WITH_BUILDINFO     "Include extra build details" ON)
-option(WITH_IK_ITASC      "Enable ITASC IK solver" ON)
+option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
+option(WITH_PYTHON        "Enable Embedded Python API  (only disable for development)" ON)
+option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
+option(WITH_PYTHON_MODULE "Enable building as a python module (experemental, only enable for development)" OFF)
+option(WITH_BUILDINFO     "Include extra build details (only disable for development & faster builds)" ON)
+option(WITH_IK_ITASC      "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
 option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
 option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 option(WITH_GAMEENGINE    "Enable Game Engine" ON)
@@ -126,16 +126,29 @@
 # Misc
 option(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON) 
 option(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
+if(UNIX AND NOT APPLE)
+	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
+endif()
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
 
 # Debug
-option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
+option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF)
 mark_as_advanced(WITH_CXX_GUARDEDALLOC)
 
 option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
 mark_as_advanced(WITH_ASSERT_ABORT)
 
 if(APPLE)
+	if(NOT CMAKE_OSX_ARCHITECTURES)
+		set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
+		"Choose the architecture you want to build Blender for: i386, x86_64 or ppc"
+		FORCE)
+	endif()
+	if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+		set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5 CACHE STRING
+		"Choose the minimum OSX version required: 10.4 or 10.5"
+		FORCE)
+	endif()
 	option(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
 	option(USE_QTKIT	  "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
 	option(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
@@ -187,9 +200,17 @@
 
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
 # On Unix: 
-#   cmake -D PYTHON_LIBRARY=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INCLUDE_DIRS=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
+#   cmake ../blender \
+#         -D PYTHON_VERSION=3.2 \
+#         -D PYTHON_INCLUDE_DIRS=/opt/py32/include/python3.2d \
+#         -D PYTHON_LIBPATH=/opt/py32/lib \
+#         -D PYTHON_LIBRARY=python3.2d
+#
 # On Macs: 
-#   cmake -D PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.1/lib/python3.1/config -G Xcode ../blender
+#   cmake ../blender \
+#         -D PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2 \
+#         -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.2/lib/python3.2/config \
+#         -G Xcode
 #
 # When changing any of this remember to update the notes in doc/build_systems/cmake.txt
 
@@ -244,23 +265,19 @@
 
 
 	if(WITH_PYTHON)
-		# No way to set py31. remove for now.
+		# No way to set py32. remove for now.
 		# find_package(PythonLibs)
-		set(PYTHON /usr)
-		set(PYTHON_VERSION 3.1 CACHE STRING "")
-		mark_as_advanced(PYTHON_VERSION)
-		set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
-		mark_as_advanced(PYTHON_INCLUDE_DIRS)
-		# set(PYTHON_BINARY python) # not used yet
-		set(PYTHON_LIBRARY python${PYTHON_VERSION} CACHE STRING "")
-		mark_as_advanced(PYTHON_LIBRARY)
-		set(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
-		mark_as_advanced(PYTHON_LIBPATH)
-		# find_package(PythonInterp) # not used yet
-		# set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
 
-		set(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
-		mark_as_advanced(PYTHON_LINKFLAGS)
+		# defines...
+		
+		#  PYTHON_VERSION
+		#  PYTHON_INCLUDE_DIRS
+		#  PYTHON_LIBRARY
+		#  PYTHON_LIBPATH
+		#  PYTHON_LINKFLAGS
+
+		include(build_files/cmake/FindPythonLibsUnix.cmake)
+
 	endif()
 
 	if(WITH_SDL)
@@ -619,9 +636,9 @@
 
 		# MSVC only, Mingw doesnt need
 		if(CMAKE_CL_64)
-			set(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib ")
+			set(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib /STACK:2097152 ")
 		else()
-			set(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
+			set(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib /STACK:2097152 ")
 		endif()
 
 		set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
@@ -715,16 +732,17 @@
 			set(WITH_JACK OFF)
 		endif()
 
-		# TODO: mingw move to Python 3.2
 		if(WITH_PYTHON)
 			set(PYTHON ${LIBDIR}/python)
-			set(PYTHON_VERSION 3.1)
+			set(PYTHON_VERSION 3.2)
 			set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}")
 			# set(PYTHON_BINARY python) # not used yet
-			set(PYTHON_LIBRARY python31mw)
+			set(PYTHON_LIBRARY python32mw)
 			set(PYTHON_LIBPATH ${PYTHON}/lib)
 		endif()
 
+		set(PLATFORM_LINKFLAGS "--stack,2097152")
+
 	endif()
 
 	# used in many places so include globally, like OpenGL
@@ -732,6 +750,10 @@
 
 elseif(APPLE)
 
+	if (${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.5")
+		set(WITH_LIBS10.5 ON CACHE BOOL "Use 10.5 libs" FORCE)
+	endif()
+
 	if(WITH_LIBS10.5)
 		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-9.x.universal)
 	else()
@@ -770,7 +792,7 @@
 	set(PYTHON_VERSION 3.2)
 
 	if(PYTHON_VERSION MATCHES 3.2)
-		# we use precompiled libraries for py 3.1 and up by default
+		# we use precompiled libraries for py 3.2 and up by default
 
 		set(PYTHON ${LIBDIR}/python)
 		set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}")
@@ -782,7 +804,7 @@
 		# otherwise, use custom system framework
 
 		set(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
-		set(PYTHON_VERSION 3.1)
+		set(PYTHON_VERSION 3.2)
 		set(PYTHON_INCLUDE_DIRS "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}")
 		# set(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet
 		set(PYTHON_LIBRARY "")

Modified: branches/soc-2008-mxcurioni/GNUmakefile
===================================================================
--- branches/soc-2008-mxcurioni/GNUmakefile	2011-03-13 01:15:14 UTC (rev 35505)
+++ branches/soc-2008-mxcurioni/GNUmakefile	2011-03-13 02:10:39 UTC (rev 35506)
@@ -75,7 +75,7 @@
 
 	@echo 
 	@echo Building Blender ...
-	cd $(BUILD_DIR) ; make -s -j $(NPROCS)
+	cd $(BUILD_DIR) ; make -s -j $(NPROCS) install
 	@echo 
 	@echo run blender from "$(BUILD_DIR)/bin/blender"
 	@echo 

Copied: branches/soc-2008-mxcurioni/build_files/cmake/FindPythonLibsUnix.cmake (from rev 35505, trunk/blender/build_files/cmake/FindPythonLibsUnix.cmake)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/FindPythonLibsUnix.cmake	                        (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/cmake/FindPythonLibsUnix.cmake	2011-03-13 02:10:39 UTC (rev 35506)
@@ -0,0 +1,72 @@
+# - Find python libraries
+#
+#  PYTHON_VERSION
+#  PYTHON_INCLUDE_DIRS
+#  PYTHON_LIBRARY
+#  PYTHON_LIBPATH
+#  PYTHON_LINKFLAGS
+
+#=============================================================================
+
+set(PYTHON_VERSION 3.2 CACHE STRING "")
+mark_as_advanced(PYTHON_VERSION)
+
+set(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
+mark_as_advanced(PYTHON_LINKFLAGS)
+
+set(_Python_ABI_FLAGS
+	"m;mu;u; ")
+
+string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
+set(_Python_PATHS
+  "$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}" "/opt/py${_PYTHON_VERSION_NO_DOTS}" "/usr" "/usr/local")
+
+if(NOT DEFINED PYTHON_INCLUDE_DIRS)
+	message(STATUS "Looking for include Python.h")
+	set(_Found_PYTHON_H OFF)
+
+	foreach(_CURRENT_PATH ${_Python_PATHS})
+		foreach(_CURRENT_ABI_FLAGS ${_Python_ABI_FLAGS})
+			if(CMAKE_BUILD_TYPE STREQUAL Debug)
+				set(_CURRENT_ABI_FLAGS "d${_CURRENT_ABI_FLAGS}")
+			endif()
+			string(REPLACE " " "" _CURRENT_ABI_FLAGS ${_CURRENT_ABI_FLAGS})
+
+			set(_Python_HEADER "${_CURRENT_PATH}/include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}/Python.h")
+
+			if(EXISTS ${_Python_HEADER})
+				message(STATUS "Checking for header: ${_Python_HEADER} - found")
+				set(_Found_PYTHON_H ON)
+				set(PYTHON ${_CURRENT_PATH})
+				set(PYTHON_ABI_FLAGS ${_CURRENT_ABI_FLAGS})
+				break()
+			else()
+				message(STATUS "Checking for header: ${_Python_HEADER}")
+			endif()
+		endforeach()
+		
+		if(_Found_PYTHON_H)
+			break()
+		endif()
+	endforeach()
+
+	if(NOT _Found_PYTHON_H)
+		message(FATAL_ERROR "Python.h not found")
+	endif()
+endif()
+
+#=============================================================================
+# now the python versions are found
+
+
+set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
+mark_as_advanced(PYTHON_INCLUDE_DIRS)
+set(PYTHON_LIBRARY "python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list