[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55274] branches/soc-2011-tomato: Merging r55080 through r55271 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Thu Mar 14 10:55:06 CET 2013
Revision: 55274
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55274
Author: nazgul
Date: 2013-03-14 09:55:05 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Merging r55080 through r55271 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55080
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55271
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/SConstruct
branches/soc-2011-tomato/build_files/buildbot/slave_compile.py
branches/soc-2011-tomato/build_files/buildbot/slave_pack.py
branches/soc-2011-tomato/build_files/cmake/clang_array_check.py
branches/soc-2011-tomato/build_files/cmake/macros.cmake
branches/soc-2011-tomato/extern/CMakeLists.txt
branches/soc-2011-tomato/extern/SConscript
branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt
branches/soc-2011-tomato/extern/bullet2/readme.txt
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Gimpact/btCompoundFromGimpact.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Gimpact/gim_array.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Gimpact/gim_box_collision.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftBodyData.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftBodySolvers.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
branches/soc-2011-tomato/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btAabbUtil2.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btConvexHull.cpp
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btConvexHullComputer.cpp
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btDefaultMotionState.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btGrahamScan2dConvexHull.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btIDebugDraw.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btMatrix3x3.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btQuadWord.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btQuaternion.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btScalar.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btSerializer.cpp
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btSerializer.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btTransform.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btVector3.h
branches/soc-2011-tomato/extern/bullet2/src/SConscript
branches/soc-2011-tomato/extern/bullet2/src/btBulletCollisionCommon.h
branches/soc-2011-tomato/extern/bullet2/src/btBulletDynamicsCommon.h
branches/soc-2011-tomato/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
branches/soc-2011-tomato/intern/cycles/blender/blender_camera.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_session.h
branches/soc-2011-tomato/intern/cycles/blender/blender_sync.h
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_math.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_texture.h
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_vector_math.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_wave_texture.osl
branches/soc-2011-tomato/intern/ghost/GHOST_ISystem.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_Event.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_EventManager.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_EventManager.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_Path-api.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_System.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_System.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_TimerManager.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_TimerTask.h
branches/soc-2011-tomato/intern/memutil/MEM_Allocator.h
branches/soc-2011-tomato/intern/memutil/MEM_CacheLimiter.h
branches/soc-2011-tomato/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
branches/soc-2011-tomato/intern/opencolorio/ocio_impl.h
branches/soc-2011-tomato/intern/string/intern/STR_String.cpp
branches/soc-2011-tomato/intern/utfconv/utf_winfunc.c
branches/soc-2011-tomato/intern/utfconv/utf_winfunc.h
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/soc-2011-tomato/release/scripts/modules/console/complete_import.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/__init__.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_paint_common.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_nla.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-tomato/release/scripts/startup/keyingsets_builtins.py
branches/soc-2011-tomato/release/windows/contrib/vfapi/vfapi-plugin.c
branches/soc-2011-tomato/source/blender/avi/intern/avi.c
branches/soc-2011-tomato/source/blender/blenfont/BLF_api.h
branches/soc-2011-tomato/source/blender/blenfont/BLF_translation.h
branches/soc-2011-tomato/source/blender/blenfont/intern/blf.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_internal.h
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_translation.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_animsys.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_brush.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_curve.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_font.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_idcode.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_image.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_library.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mball.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_packedFile.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_paint.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_pbvh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_text.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_unit.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/bmfont.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/context.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/idcode.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/idprop.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image_gen.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/implicit.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/library.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mball.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/nla.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/packedFile.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/paint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pbvh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/property.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqcache.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/texture.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/unit.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_fileops.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_gsqueue.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_heap.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_lasso.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_base.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_inline.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_vector.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_rect.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_winstuff.h
branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenlib/SConscript
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2011-tomato/source/blender/blenlib/intern/fileops.c
branches/soc-2011-tomato/source/blender/blenlib/intern/freetypefont.c
branches/soc-2011-tomato/source/blender/blenlib/intern/gsqueue.c
branches/soc-2011-tomato/source/blender/blenlib/intern/lasso.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_base.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_matrix.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
branches/soc-2011-tomato/source/blender/blenlib/intern/rct.c
branches/soc-2011-tomato/source/blender/blenlib/intern/storage.c
branches/soc-2011-tomato/source/blender/blenlib/intern/string_utf8.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/versioning_250.c
branches/soc-2011-tomato/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/bmesh/CMakeLists.txt
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_core.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mods.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_structure.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_create.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_smooth_laplacian.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_bevel.h
branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/soc-2011-tomato/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-tomato/source/blender/collada/AnimationExporter.h
branches/soc-2011-tomato/source/blender/collada/DocumentExporter.cpp
branches/soc-2011-tomato/source/blender/collada/ExportSettings.h
branches/soc-2011-tomato/source/blender/collada/GeometryExporter.h
branches/soc-2011-tomato/source/blender/collada/MaterialExporter.h
branches/soc-2011-tomato/source/blender/collada/SceneExporter.cpp
branches/soc-2011-tomato/source/blender/collada/SceneExporter.h
branches/soc-2011-tomato/source/blender/collada/TransformWriter.cpp
branches/soc-2011-tomato/source/blender/collada/TransformWriter.h
branches/soc-2011-tomato/source/blender/collada/collada.cpp
branches/soc-2011-tomato/source/blender/collada/collada.h
branches/soc-2011-tomato/source/blender/collada/collada_internal.cpp
branches/soc-2011-tomato/source/blender/collada/collada_internal.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PreviewOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TranslateOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.h
branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_markers.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_ops.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
branches/soc-2011-tomato/source/blender/editors/animation/keyingsets.c
branches/soc-2011-tomato/source/blender/editors/armature/armature_add.c
branches/soc-2011-tomato/source/blender/editors/armature/armature_naming.c
branches/soc-2011-tomato/source/blender/editors/armature/armature_relations.c
branches/soc-2011-tomato/source/blender/editors/armature/armature_select.c
branches/soc-2011-tomato/source/blender/editors/armature/armature_utils.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_generate.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2011-tomato/source/blender/editors/armature/pose_edit.c
branches/soc-2011-tomato/source/blender/editors/armature/pose_group.c
branches/soc-2011-tomato/source/blender/editors/armature/pose_lib.c
branches/soc-2011-tomato/source/blender/editors/armature/pose_select.c
branches/soc-2011-tomato/source/blender/editors/armature/pose_slide.c
branches/soc-2011-tomato/source/blender/editors/armature/reeb.c
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/curve/editfont.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-tomato/source/blender/editors/include/ED_armature.h
branches/soc-2011-tomato/source/blender/editors/include/ED_curve.h
branches/soc-2011-tomato/source/blender/editors/include/ED_mesh.h
branches/soc-2011-tomato/source/blender/editors/include/ED_numinput.h
branches/soc-2011-tomato/source/blender/editors/include/ED_screen.h
branches/soc-2011-tomato/source/blender/editors/include/ED_sequencer.h
branches/soc-2011-tomato/source/blender/editors/include/ED_space_api.h
branches/soc-2011-tomato/source/blender/editors/include/ED_transform.h
branches/soc-2011-tomato/source/blender/editors/include/ED_view3d.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_style.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-tomato/source/blender/editors/interface/view2d.c
branches/soc-2011-tomato/source/blender/editors/interface/view2d_ops.c
branches/soc-2011-tomato/source/blender/editors/io/io_collada.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_add.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editface.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_add.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_intern.h
branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.c
branches/soc-2011-tomato/source/blender/editors/metaball/mball_edit.c
branches/soc-2011-tomato/source/blender/editors/metaball/mball_ops.c
branches/soc-2011-tomato/source/blender/editors/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/object/object_bake.c
branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/object/object_ops.c
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
branches/soc-2011-tomato/source/blender/editors/physics/particle_edit.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_ops.c
branches/soc-2011-tomato/source/blender/editors/physics/rigidbody_object.c
branches/soc-2011-tomato/source/blender/editors/physics/rigidbody_world.c
branches/soc-2011-tomato/source/blender/editors/render/SConscript
branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
branches/soc-2011-tomato/source/blender/editors/render/render_opengl.c
branches/soc-2011-tomato/source/blender/editors/render/render_preview.c
branches/soc-2011-tomato/source/blender/editors/render/render_shading.c
branches/soc-2011-tomato/source/blender/editors/render/render_view.c
branches/soc-2011-tomato/source/blender/editors/screen/area.c
branches/soc-2011-tomato/source/blender/editors/screen/glutil.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/screen/screendump.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/SConscript
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image_2d.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/soc-2011-tomato/source/blender/editors/sound/sound_ops.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_edit.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_select.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_dopesheet_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_intern.h
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_toolbar.c
branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_select.c
branches/soc-2011-tomato/source/blender/editors/space_console/console_draw.c
branches/soc-2011-tomato/source/blender/editors/space_console/console_ops.c
branches/soc-2011-tomato/source/blender/editors/space_console/space_console.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c
branches/soc-2011-tomato/source/blender/editors/space_file/space_file.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_ops.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_select.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
branches/soc-2011-tomato/source/blender/editors/space_image/space_image.c
branches/soc-2011-tomato/source/blender/editors/space_info/info_ops.c
branches/soc-2011-tomato/source/blender/editors/space_info/info_report.c
branches/soc-2011-tomato/source/blender/editors/space_info/info_stats.c
branches/soc-2011-tomato/source/blender/editors/space_info/textview.c
branches/soc-2011-tomato/source/blender/editors/space_logic/logic_ops.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_channels.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_draw.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_edit.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_intern.h
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_ops.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_select.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_add.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_group.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
branches/soc-2011-tomato/source/blender/editors/space_node/node_ops.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_relationships.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_select.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_view.c
branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_view.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2011-tomato/source/blender/editors/space_text/space_text.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_autocomplete.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_draw.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_format.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_format_lua.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_format_osl.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_format_py.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_ops.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_project.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.h
branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_input.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_ops.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_snap.c
branches/soc-2011-tomato/source/blender/editors/util/editmode_undo.c
branches/soc-2011-tomato/source/blender/editors/util/numinput.c
branches/soc-2011-tomato/source/blender/editors/util/undo.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-tomato/source/blender/gpu/CMakeLists.txt
branches/soc-2011-tomato/source/blender/gpu/GPU_extensions.h
branches/soc-2011-tomato/source/blender/gpu/SConscript
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_vertex.glsl
branches/soc-2011-tomato/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_indexer.h
branches/soc-2011-tomato/source/blender/imbuf/intern/bmp.c
branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
branches/soc-2011-tomato/source/blender/imbuf/intern/dds/BlockDXT.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/moviecache.c
branches/soc-2011-tomato/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2011-tomato/source/blender/imbuf/intern/targa.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_brush_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-tomato/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
branches/soc-2011-tomato/source/blender/makesrna/RNA_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_action.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_animation.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_boid.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_camera.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_color.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_context.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_controller.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_group.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_key.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_meta.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nla.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_packedfile.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sensor_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_text_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_timeline.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_build.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types_meshdata.h
branches/soc-2011-tomato/source/blender/python/generic/idprop_py_api.c
branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-tomato/source/blender/python/intern/bpy.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_library.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_operator.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-tomato/source/blender/render/CMakeLists.txt
branches/soc-2011-tomato/source/blender/render/SConscript
branches/soc-2011-tomato/source/blender/render/extern/include/RE_engine.h
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject.cpp
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/envmap.c
branches/soc-2011-tomato/source/blender/render/intern/source/external_engine.c
branches/soc-2011-tomato/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-tomato/source/blender/render/intern/source/occlusion.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-tomato/source/blender/render/intern/source/rayshade.c
branches/soc-2011-tomato/source/blender/render/intern/source/sss.c
branches/soc-2011-tomato/source/blender/render/intern/source/volume_precache.c
branches/soc-2011-tomato/source/blender/render/intern/source/voxeldata.c
branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
branches/soc-2011-tomato/source/blender/windowmanager/WM_types.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_dragdrop.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-tomato/source/blender/windowmanager/wm_window.h
branches/soc-2011-tomato/source/blenderplayer/CMakeLists.txt
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_IActuator.h
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2011-tomato/source/tests/bl_pyapi_mathutils.py
branches/soc-2011-tomato/source/tools/check_style_c.py
Added Paths:
-----------
branches/soc-2011-tomato/build_files/buildbot/config/user-config-mac-i386.py
branches/soc-2011-tomato/build_files/buildbot/config/user-config-mac-x86_64.py
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btPolarDecomposition.cpp
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btPolarDecomposition.h
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btVector3.cpp
branches/soc-2011-tomato/extern/wcwidth/
branches/soc-2011-tomato/extern/wcwidth/CMakeLists.txt
branches/soc-2011-tomato/extern/wcwidth/SConscript
branches/soc-2011-tomato/extern/wcwidth/wcwidth.c
branches/soc-2011-tomato/extern/wcwidth/wcwidth.h
branches/soc-2011-tomato/release/datafiles/fonts/bmonofont-i18n.ttf.gz
branches/soc-2011-tomato/release/scripts/presets/interaction/3dsmax.py
branches/soc-2011-tomato/release/scripts/presets/keyconfig/3dsmax.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_constraint.py
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_ruler.c
branches/soc-2011-tomato/source/blender/gpu/GPU_simple_shader.h
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_simple_shader.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_simple_frag.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
Removed Paths:
-------------
branches/soc-2011-tomato/extern/bullet2/patches/make_id.patch
branches/soc-2011-tomato/extern/bullet2/patches/pvs_warning_fixes.patch
branches/soc-2011-tomato/extern/wcwidth/CMakeLists.txt
branches/soc-2011-tomato/extern/wcwidth/SConscript
branches/soc-2011-tomato/extern/wcwidth/wcwidth.c
branches/soc-2011-tomato/extern/wcwidth/wcwidth.h
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_subdivide.h
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_fixed_material.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_fixed_fragment.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_fixed_vertex.glsl
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-55079
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-55271
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2013-03-14 09:50:29 UTC (rev 55273)
+++ branches/soc-2011-tomato/CMakeLists.txt 2013-03-14 09:55:05 UTC (rev 55274)
@@ -1924,6 +1924,7 @@
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_NULL -Wnonnull) # C only
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_REDUNDANT_DECLS -Wredundant-decls)
# gcc 4.2 gives annoying warnings on every file with this
if (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
@@ -1944,6 +1945,7 @@
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_INIT_SELF -Winit-self) # needs -Wuninitialized
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_REDUNDANT_DECLS -Wredundant-decls)
# gcc 4.2 gives annoying warnings on every file with this
if (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
@@ -1990,6 +1992,10 @@
# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_MACROS -Wunused-macros)
# ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNUSED_MACROS -Wunused-macros)
+ # flags to undo strict flags
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
+
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct 2013-03-14 09:50:29 UTC (rev 55273)
+++ branches/soc-2011-tomato/SConstruct 2013-03-14 09:55:05 UTC (rev 55274)
@@ -527,8 +527,8 @@
data_to_c_simple("release/datafiles/preview_cycles.blend")
# --- glsl ---
- data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fixed_fragment.glsl")
- data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fixed_vertex.glsl")
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_simple_frag.glsl")
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_simple_vert.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl")
Copied: branches/soc-2011-tomato/build_files/buildbot/config/user-config-mac-i386.py (from rev 55271, trunk/blender/build_files/buildbot/config/user-config-mac-i386.py)
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-mac-i386.py (rev 0)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-mac-i386.py 2013-03-14 09:55:05 UTC (rev 55274)
@@ -0,0 +1,420 @@
+#
+# Note : if you want to alter this file
+# copy it as a whole in the upper folder
+# as user-config.py
+# dont create a new file with only some
+# vars changed.
+
+import commands
+
+# IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs
+USE_SDK=True
+
+#############################################################################
+################### Cocoa & architecture settings ##################
+#############################################################################
+WITH_GHOST_COCOA=True
+MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
+
+
+cmd = 'uname -p'
+MAC_PROC=commands.getoutput(cmd)
+cmd = 'uname -r'
+cmd_res=commands.getoutput(cmd)
+
+if cmd_res[:1]=='7':
+ MAC_CUR_VER='10.3'
+elif cmd_res[:1]=='8':
+ MAC_CUR_VER='10.4'
+elif cmd_res[:1]=='9':
+ MAC_CUR_VER='10.5'
+elif cmd_res[:2]=='10':
+ MAC_CUR_VER='10.6'
+elif cmd_res[:2]=='11':
+ MAC_CUR_VER='10.7'
+elif cmd_res[:2]=='12':
+ MAC_CUR_VER='10.8'
+cmd = 'xcodebuild -version'
+cmd_xcode=commands.getoutput(cmd)
+XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
+cmd = 'xcodebuild -showsdks'
+cmd_sdk=commands.getoutput(cmd)
+MACOSX_SDK_CHECK=cmd_sdk
+
+if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
+ USE_QTKIT=True # Carbon quicktime is not available for 64bit
+
+
+# Default target OSX settings per architecture
+# Can be customized
+
+if MACOSX_ARCHITECTURE == 'ppc' and MAC_CUR_VER == '10.4':
+# all releases are now made for 10.5 !
+# MAC_MIN_VERS = '10.3'
+# MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
+# LCGDIR = '#../lib/darwin-6.1-powerpc'
+# CC = 'gcc-3.3'
+# CXX = 'g++-3.3'
+ MAC_MIN_VERS = '10.4'
+ MACOSX_DEPLOYMENT_TARGET = '10.4'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+ LCGDIR = '#../lib/darwin-8.0.0-powerpc'
+ CC = 'gcc-4.0'
+ CXX = 'g++-4.0'
+elif MACOSX_ARCHITECTURE == 'i386' and MAC_CUR_VER == '10.4':
+ MAC_MIN_VERS = '10.4'
+ MACOSX_DEPLOYMENT_TARGET = '10.4'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+ LCGDIR = '#../lib/darwin-8.x.i386'
+ CC = 'gcc-4.0'
+ CXX = 'g++-4.0'
+else :
+ if 'Mac OS X 10.5' in MACOSX_SDK_CHECK:
+ # OSX 10.5/6 with Xcode 3.x
+ MAC_MIN_VERS = '10.5'
+ MACOSX_DEPLOYMENT_TARGET = '10.5'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
+ LCGDIR = '#../lib/darwin-9.x.universal'
+ CC = 'gcc-4.2'
+ CXX = 'g++-4.2'
+ elif 'Mac OS X 10.6' in MACOSX_SDK_CHECK:
+ # OSX 10.6/7 with Xcode 4.x
+ MAC_MIN_VERS = '10.6'
+ MACOSX_DEPLOYMENT_TARGET = '10.6'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.6.sdk'
+ LCGDIR = '#../lib/darwin-9.x.universal'
+ CC = 'gcc-4.2'
+ CXX = 'g++-4.2'
+ else:
+ # OSX 10.8 with Xcode 4.4 and higher (no 10.6sdk! )
+ MAC_MIN_VERS = '10.6'
+ MACOSX_DEPLOYMENT_TARGET = '10.6'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.7.sdk'
+ LCGDIR = '#../lib/darwin-9.x.universal'
+ CC = 'gcc'
+ CXX = 'g++'
+
+LIBDIR = '${LCGDIR}'
+
+if XCODE_CUR_VER >= '4.3': ## since version 4.3, XCode and developer dir are bundled ##
+ MACOSX_SDK = '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform' + MACOSX_SDK
+
+#############################################################################
+################### Dependency settings ##################
+#############################################################################
+
+#Defaults openMP to true if compiler handles it ( only gcc 4.6.1 and newer )
+# if your compiler does not have accurate suffix you may have to enable it by hand !
+if CC[:-2].endswith('4.6'):
+ WITH_BF_OPENMP = True # multithreading for fluids, cloth, sculpt and smoke
+else:
+ WITH_BF_OPENMP = False
+
+# enable ffmpeg support
+WITH_BF_FFMPEG = True
+BF_FFMPEG = LIBDIR + '/ffmpeg'
+BF_FFMPEG_INC = "${BF_FFMPEG}/include"
+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg bz2'
+#bz2 is a standard osx dynlib
+
+BF_PYTHON_VERSION = '3.3'
+WITH_OSX_STATICPYTHON = True
+
+if WITH_OSX_STATICPYTHON:
+ # python 3.3 uses precompiled libraries in bf svn /lib by default
+
+ BF_PYTHON = LIBDIR + '/python'
+ BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}m'
+ # BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+ BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}m'
+ BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}'
+ # BF_PYTHON_LINKFLAGS = ['-u', '_PyMac_Error', '-framework', 'System']
+else:
+ # python 3.2 uses Python-framework additionally installed in /Library/Frameworks
+
+ BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
+ BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}m'
+ BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
+ #BF_PYTHON_LIB = ''
+ BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config-${BF_PYTHON_VERSION}m'
+
+WITH_BF_OPENAL = True
+#different lib must be used following version of gcc
+# for gcc 3.3
+#BF_OPENAL = LIBDIR + '/openal'
+# for gcc 3.4 and ulterior
+if MAC_PROC == 'powerpc':
+ BF_OPENAL = '#../lib/darwin-8.0.0-powerpc/openal'
+else :
+ BF_OPENAL = LIBDIR + '/openal'
+
+WITH_BF_STATICOPENAL = False
+BF_OPENAL_INC = '${BF_OPENAL}/include' # only headers from libdir needed for proper use of framework !!!!
+#BF_OPENAL_LIB = 'openal'
+#BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+#BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = False
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+# we use simply jack framework
+WITH_BF_JACK = True
+BF_JACK = '/Library/Frameworks/Jackmp.framework'
+BF_JACK_INC = '${BF_JACK}/headers'
+#BF_JACK_LIB = 'jack' # not used due framework
+BF_JACK_LIBPATH = '${BF_JACK}'
+
+WITH_BF_SNDFILE = True
+BF_SNDFILE = LIBDIR + '/sndfile'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list