[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16774] branches/nurbs/blender: Merged from Rev 16043 of the HEAD to 16751

Emmanuel Stone emmanuel.stone at gmail.com
Sun Sep 28 03:40:01 CEST 2008


Revision: 16774
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16774
Author:   eman
Date:     2008-09-28 03:39:48 +0200 (Sun, 28 Sep 2008)

Log Message:
-----------
Merged from Rev 16043 of the HEAD to 16751
Had to patch up some code to make it work with Campbell's recent changes.

WARNING: This is _very very_ unstable, unresolved memory issues. Only committing so that Campbell can take a look.

Disabled Incremental calc optimisation until I fix a bug with IsoLines.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16043

Modified Paths:
--------------
    branches/nurbs/blender/CMake/macros.cmake
    branches/nurbs/blender/CMakeLists.txt
    branches/nurbs/blender/SConstruct
    branches/nurbs/blender/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
    branches/nurbs/blender/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
    branches/nurbs/blender/blenderplayer/CMakeLists.txt
    branches/nurbs/blender/config/darwin-config.py
    branches/nurbs/blender/config/linux2-config.py
    branches/nurbs/blender/config/linuxcross-config.py
    branches/nurbs/blender/config/openbsd3-config.py
    branches/nurbs/blender/config/sunos5-config.py
    branches/nurbs/blender/config/win32-mingw-config.py
    branches/nurbs/blender/config/win32-vc-config.py
    branches/nurbs/blender/extern/bullet2/CMakeLists.txt
    branches/nurbs/blender/extern/bullet2/Makefile
    branches/nurbs/blender/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
    branches/nurbs/blender/extern/bullet2/readme.txt
    branches/nurbs/blender/extern/bullet2/src/Bullet-C-Api.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CMakeLists.txt
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Jamfile
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/CMakeLists.txt
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/Jamfile
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
    branches/nurbs/blender/extern/bullet2/src/CMakeLists.txt
    branches/nurbs/blender/extern/bullet2/src/Jamfile
    branches/nurbs/blender/extern/bullet2/src/LinearMath/CMakeLists.txt
    branches/nurbs/blender/extern/bullet2/src/LinearMath/Jamfile
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btAabbUtil2.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btAlignedAllocator.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btDefaultMotionState.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btGeometryUtil.cpp
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btGeometryUtil.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btIDebugDraw.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btMatrix3x3.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btMinMax.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btMotionState.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btQuadWord.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btQuaternion.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btQuickprof.cpp
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btQuickprof.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btScalar.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btStackAlloc.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btTransform.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btTransformUtil.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btVector3.h
    branches/nurbs/blender/extern/bullet2/src/Makefile
    branches/nurbs/blender/extern/bullet2/src/SConscript
    branches/nurbs/blender/extern/bullet2/src/btBulletCollisionCommon.h
    branches/nurbs/blender/extern/bullet2/src/btBulletDynamicsCommon.h
    branches/nurbs/blender/extern/glew/SConscript
    branches/nurbs/blender/extern/glew/include/GL/glew.h
    branches/nurbs/blender/extern/glew/src/glew.c
    branches/nurbs/blender/intern/SoundSystem/SConscript
    branches/nurbs/blender/intern/SoundSystem/SoundDefines.h
    branches/nurbs/blender/intern/SoundSystem/intern/SND_Utils.cpp
    branches/nurbs/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp
    branches/nurbs/blender/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp
    branches/nurbs/blender/intern/elbeem/CMakeLists.txt
    branches/nurbs/blender/intern/elbeem/SConscript
    branches/nurbs/blender/intern/elbeem/extern/LBM_fluidsim.h
    branches/nurbs/blender/intern/elbeem/extern/elbeem.h
    branches/nurbs/blender/intern/elbeem/intern/elbeem.cpp
    branches/nurbs/blender/intern/elbeem/intern/isosurface.cpp
    branches/nurbs/blender/intern/elbeem/intern/ntl_geometryclass.h
    branches/nurbs/blender/intern/elbeem/intern/ntl_geometryobject.cpp
    branches/nurbs/blender/intern/elbeem/intern/ntl_geometryobject.h
    branches/nurbs/blender/intern/elbeem/intern/ntl_ray.cpp
    branches/nurbs/blender/intern/elbeem/intern/ntl_ray.h
    branches/nurbs/blender/intern/elbeem/intern/ntl_world.cpp
    branches/nurbs/blender/intern/elbeem/intern/simulation_object.cpp
    branches/nurbs/blender/intern/elbeem/intern/solver_adap.cpp
    branches/nurbs/blender/intern/elbeem/intern/solver_class.h
    branches/nurbs/blender/intern/elbeem/intern/solver_init.cpp
    branches/nurbs/blender/intern/elbeem/intern/solver_main.cpp
    branches/nurbs/blender/intern/elbeem/intern/solver_relax.h
    branches/nurbs/blender/intern/elbeem/make/msvc_7_0/elbeem.vcproj
    branches/nurbs/blender/intern/ghost/GHOST_ISystem.h
    branches/nurbs/blender/intern/ghost/GHOST_Types.h
    branches/nurbs/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/nurbs/blender/intern/ghost/intern/GHOST_SystemCarbon.h
    branches/nurbs/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/nurbs/blender/intern/ghost/intern/GHOST_SystemWin32.h
    branches/nurbs/blender/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/nurbs/blender/intern/ghost/intern/GHOST_SystemX11.h
    branches/nurbs/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/nurbs/blender/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/nurbs/blender/intern/ghost/intern/GHOST_WindowX11.h
    branches/nurbs/blender/intern/guardedalloc/MEM_guardedalloc.h
    branches/nurbs/blender/intern/guardedalloc/intern/mallocn.c
    branches/nurbs/blender/intern/guardedalloc/intern/mmap_win.c
    branches/nurbs/blender/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
    branches/nurbs/blender/intern/guardedalloc/mmap_win.h
    branches/nurbs/blender/intern/iksolver/CMakeLists.txt
    branches/nurbs/blender/intern/iksolver/SConscript
    branches/nurbs/blender/intern/memutil/MEM_Allocator.h
    branches/nurbs/blender/intern/memutil/MEM_CacheLimiter.h
    branches/nurbs/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/nurbs/blender/intern/moto/include/GEN_Map.h
    branches/nurbs/blender/intern/moto/include/MT_Matrix4x4.h
    branches/nurbs/blender/intern/moto/include/MT_Matrix4x4.inl
    branches/nurbs/blender/intern/nurbana/extern/nurbana.h
    branches/nurbs/blender/intern/nurbana/intern/NURBS_Generate.cpp
    branches/nurbs/blender/intern/nurbana/intern/NURBS_Generate.h
    branches/nurbs/blender/intern/nurbana/intern/NURBS_Knot.cpp
    branches/nurbs/blender/intern/nurbana/intern/Object_NURBS.cpp
    branches/nurbs/blender/intern/nurbana/intern/libNurbana.cpp
    branches/nurbs/blender/intern/opennl/make/msvc_7_0/opennl.vcproj
    branches/nurbs/blender/intern/opennl/superlu/smemory.c
    branches/nurbs/blender/po/fr.po
    branches/nurbs/blender/po/kr.po
    branches/nurbs/blender/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
    branches/nurbs/blender/projectfiles_vc7/blender/blender.sln
    branches/nurbs/blender/projectfiles_vc7/blender/blender.vcproj
    branches/nurbs/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
    branches/nurbs/blender/projectfiles_vc7/blender/nodes/nodes.vcproj
    branches/nurbs/blender/projectfiles_vc7/blender/radiosity/BRA_radiosity.vcproj
    branches/nurbs/blender/projectfiles_vc7/blender/src/BL_src.vcproj
    branches/nurbs/blender/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
    branches/nurbs/blender/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
    branches/nurbs/blender/projectfiles_vc7/gameengine/expression/EXP_expressions.vcproj
    branches/nurbs/blender/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
    branches/nurbs/blender/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj
    branches/nurbs/blender/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/nurbs/blender/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
    branches/nurbs/blender/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
    branches/nurbs/blender/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
    branches/nurbs/blender/projectfiles_vc7/kernel/system/SYS_system.vcproj
    branches/nurbs/blender/release/VERSION
    branches/nurbs/blender/release/datafiles/blenderbuttons
    branches/nurbs/blender/release/datafiles/datatoc.c
    branches/nurbs/blender/release/datafiles/preview.blend
    branches/nurbs/blender/release/datafiles/splash.jpg
    branches/nurbs/blender/release/plugins/sequence/dnr.c
    branches/nurbs/blender/release/scripts/animation_bake_constraints.py
    branches/nurbs/blender/release/scripts/bpymodules/colladaImEx/collada.py
    branches/nurbs/blender/release/scripts/bpymodules/colladaImEx/cstartup.py
    branches/nurbs/blender/release/scripts/bpymodules/colladaImEx/helperObjects.py
    branches/nurbs/blender/release/scripts/bpymodules/colladaImEx/translator.py
    branches/nurbs/blender/release/scripts/console.py
    branches/nurbs/blender/release/scripts/export_obj.py
    branches/nurbs/blender/release/scripts/flt_properties.py
    branches/nurbs/blender/release/scripts/hotkeys.py
    branches/nurbs/blender/release/scripts/import_obj.py
    branches/nurbs/blender/release/scripts/mesh_cleanup.py
    branches/nurbs/blender/release/scripts/object_find.py
    branches/nurbs/blender/release/scripts/ply_export.py
    branches/nurbs/blender/release/scripts/sysinfo.py
    branches/nurbs/blender/release/text/blender.html
    branches/nurbs/blender/release/text/copyright.txt
    branches/nurbs/blender/source/Makefile
    branches/nurbs/blender/source/blender/CMakeLists.txt
    branches/nurbs/blender/source/blender/Makefile
    branches/nurbs/blender/source/blender/SConscript
    branches/nurbs/blender/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_action.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_bad_level_calls.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_blender.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_collision.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_colortools.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_curve.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_customdata.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_deform.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_effect.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_endian.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_global.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_mesh.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_node.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_particle.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_property.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_text.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_texture.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_utildefines.h
    branches/nurbs/blender/source/blender/blenkernel/CMakeLists.txt
    branches/nurbs/blender/source/blender/blenkernel/SConscript
    branches/nurbs/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    branches/nurbs/blender/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/nurbs/blender/source/blender/blenkernel/intern/DerivedMesh.c
    branches/nurbs/blender/source/blender/blenkernel/intern/Makefile
    branches/nurbs/blender/source/blender/blenkernel/intern/action.c
    branches/nurbs/blender/source/blender/blenkernel/intern/anim.c
    branches/nurbs/blender/source/blender/blenkernel/intern/armature.c
    branches/nurbs/blender/source/blender/blenkernel/intern/blender.c
    branches/nurbs/blender/source/blender/blenkernel/intern/brush.c
    branches/nurbs/blender/source/blender/blenkernel/intern/bvhutils.c
    branches/nurbs/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/nurbs/blender/source/blender/blenkernel/intern/cloth.c
    branches/nurbs/blender/source/blender/blenkernel/intern/collision.c
    branches/nurbs/blender/source/blender/blenkernel/intern/colortools.c
    branches/nurbs/blender/source/blender/blenkernel/intern/constraint.c
    branches/nurbs/blender/source/blender/blenkernel/intern/curve.c
    branches/nurbs/blender/source/blender/blenkernel/intern/deform.c
    branches/nurbs/blender/source/blender/blenkernel/intern/depsgraph.c
    branches/nurbs/blender/source/blender/blenkernel/intern/displist.c
    branches/nurbs/blender/source/blender/blenkernel/intern/effect.c
    branches/nurbs/blender/source/blender/blenkernel/intern/exotic.c
    branches/nurbs/blender/source/blender/blenkernel/intern/group.c
    branches/nurbs/blender/source/blender/blenkernel/intern/icons.c
    branches/nurbs/blender/source/blender/blenkernel/intern/image.c
    branches/nurbs/blender/source/blender/blenkernel/intern/implicit.c
    branches/nurbs/blender/source/blender/blenkernel/intern/ipo.c
    branches/nurbs/blender/source/blender/blenkernel/intern/material.c
    branches/nurbs/blender/source/blender/blenkernel/intern/mesh.c
    branches/nurbs/blender/source/blender/blenkernel/intern/modifier.c
    branches/nurbs/blender/source/blender/blenkernel/intern/multires.c
    branches/nurbs/blender/source/blender/blenkernel/intern/node.c
    branches/nurbs/blender/source/blender/blenkernel/intern/object.c
    branches/nurbs/blender/source/blender/blenkernel/intern/particle.c
    branches/nurbs/blender/source/blender/blenkernel/intern/particle_system.c
    branches/nurbs/blender/source/blender/blenkernel/intern/property.c
    branches/nurbs/blender/source/blender/blenkernel/intern/sca.c
    branches/nurbs/blender/source/blender/blenkernel/intern/scene.c
    branches/nurbs/blender/source/blender/blenkernel/intern/softbody.c
    branches/nurbs/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/nurbs/blender/source/blender/blenkernel/intern/text.c
    branches/nurbs/blender/source/blender/blenkernel/intern/texture.c
    branches/nurbs/blender/source/blender/blenlib/BLI_arithb.h
    branches/nurbs/blender/source/blender/blenlib/BLI_blenlib.h
    branches/nurbs/blender/source/blender/blenlib/BLI_editVert.h
    branches/nurbs/blender/source/blender/blenlib/BLI_kdopbvh.h
    branches/nurbs/blender/source/blender/blenlib/BLI_rand.h
    branches/nurbs/blender/source/blender/blenlib/BLI_winstuff.h
    branches/nurbs/blender/source/blender/blenlib/SConscript
    branches/nurbs/blender/source/blender/blenlib/intern/BLI_ghash.c
    branches/nurbs/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/nurbs/blender/source/blender/blenlib/intern/arithb.c
    branches/nurbs/blender/source/blender/blenlib/intern/dynlib.c
    branches/nurbs/blender/source/blender/blenlib/intern/edgehash.c
    branches/nurbs/blender/source/blender/blenlib/intern/fileops.c
    branches/nurbs/blender/source/blender/blenlib/intern/freetypefont.c
    branches/nurbs/blender/source/blender/blenlib/intern/psfont.c
    branches/nurbs/blender/source/blender/blenlib/intern/rand.c
    branches/nurbs/blender/source/blender/blenlib/intern/util.c
    branches/nurbs/blender/source/blender/blenloader/BLO_readfile.h
    branches/nurbs/blender/source/blender/blenloader/BLO_sys_types.h
    branches/nurbs/blender/source/blender/blenloader/intern/genfile.c
    branches/nurbs/blender/source/blender/blenloader/intern/readblenentry.c
    branches/nurbs/blender/source/blender/blenloader/intern/readfile.c
    branches/nurbs/blender/source/blender/blenloader/intern/writefile.c
    branches/nurbs/blender/source/blender/blenpluginapi/intern/pluginapi.c
    branches/nurbs/blender/source/blender/imbuf/intern/bmp.c
    branches/nurbs/blender/source/blender/imbuf/intern/cineon/cineonlib.c
    branches/nurbs/blender/source/blender/imbuf/intern/cineon/dpxlib.c
    branches/nurbs/blender/source/blender/imbuf/intern/cineon/logImageCore.h
    branches/nurbs/blender/source/blender/imbuf/intern/cineon/logmemfile.c
    branches/nurbs/blender/source/blender/imbuf/intern/cineon/logmemfile.h
    branches/nurbs/blender/source/blender/imbuf/intern/dds/ColorBlock.cpp
    branches/nurbs/blender/source/blender/imbuf/intern/dds/ColorBlock.h
    branches/nurbs/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/nurbs/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.h
    branches/nurbs/blender/source/blender/imbuf/intern/dds/dds_api.cpp
    branches/nurbs/blender/source/blender/imbuf/intern/divers.c
    branches/nurbs/blender/source/blender/imbuf/intern/rectop.c
    branches/nurbs/blender/source/blender/imbuf/intern/scaling.c
    branches/nurbs/blender/source/blender/include/BDR_drawmesh.h
    branches/nurbs/blender/source/blender/include/BDR_drawobject.h
    branches/nurbs/blender/source/blender/include/BDR_gpencil.h
    branches/nurbs/blender/source/blender/include/BDR_imagepaint.h
    branches/nurbs/blender/source/blender/include/BIF_drawgpencil.h
    branches/nurbs/blender/source/blender/include/BIF_drawseq.h
    branches/nurbs/blender/source/blender/include/BIF_drawtext.h
    branches/nurbs/blender/source/blender/include/BIF_editaction.h
    branches/nurbs/blender/source/blender/include/BIF_editarmature.h
    branches/nurbs/blender/source/blender/include/BIF_editseq.h
    branches/nurbs/blender/source/blender/include/BIF_editview.h
    branches/nurbs/blender/source/blender/include/BIF_gl.h
    branches/nurbs/blender/source/blender/include/BIF_glutil.h
    branches/nurbs/blender/source/blender/include/BIF_keyval.h
    branches/nurbs/blender/source/blender/include/BIF_meshlaplacian.h
    branches/nurbs/blender/source/blender/include/BIF_meshtools.h
    branches/nurbs/blender/source/blender/include/BIF_outliner.h
    branches/nurbs/blender/source/blender/include/BIF_resources.h
    branches/nurbs/blender/source/blender/include/BIF_space.h
    branches/nurbs/blender/source/blender/include/BSE_drawipo.h
    branches/nurbs/blender/source/blender/include/BSE_drawview.h
    branches/nurbs/blender/source/blender/include/BSE_editipo.h
    branches/nurbs/blender/source/blender/include/blendef.h
    branches/nurbs/blender/source/blender/include/butspace.h
    branches/nurbs/blender/source/blender/include/transform.h
    branches/nurbs/blender/source/blender/makesdna/DNA_action_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_actuator_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_brush_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_curve_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_gpencil_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_group_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_image_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_ipo_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_lamp_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_material_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_meshdata_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_modifier_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_object_fluidsim.h
    branches/nurbs/blender/source/blender/makesdna/DNA_object_force.h
    branches/nurbs/blender/source/blender/makesdna/DNA_object_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_particle_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_scene_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_sensor_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_space_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_text_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_texture_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_userdef_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_view3d_types.h
    branches/nurbs/blender/source/blender/makesdna/DNA_world_types.h
    branches/nurbs/blender/source/blender/makesdna/intern/makesdna.c
    branches/nurbs/blender/source/blender/nodes/CMakeLists.txt
    branches/nurbs/blender/source/blender/nodes/SConscript
    branches/nurbs/blender/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
    branches/nurbs/blender/source/blender/nodes/intern/CMP_nodes/Makefile
    branches/nurbs/blender/source/blender/nodes/intern/Makefile
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/Makefile
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_math.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_output.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_value.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
    branches/nurbs/blender/source/blender/nodes/intern/SHD_util.h
    branches/nurbs/blender/source/blender/python/BPY_extern.h
    branches/nurbs/blender/source/blender/python/BPY_interface.c
    branches/nurbs/blender/source/blender/python/BPY_menus.c
    branches/nurbs/blender/source/blender/python/BPY_menus.h
    branches/nurbs/blender/source/blender/python/CMakeLists.txt
    branches/nurbs/blender/source/blender/python/SConscript
    branches/nurbs/blender/source/blender/python/api2_2x/BGL.h
    branches/nurbs/blender/source/blender/python/api2_2x/Blender.c
    branches/nurbs/blender/source/blender/python/api2_2x/Camera.c
    branches/nurbs/blender/source/blender/python/api2_2x/Constraint.c
    branches/nurbs/blender/source/blender/python/api2_2x/Draw.c
    branches/nurbs/blender/source/blender/python/api2_2x/Group.c
    branches/nurbs/blender/source/blender/python/api2_2x/Image.c
    branches/nurbs/blender/source/blender/python/api2_2x/Ipo.c
    branches/nurbs/blender/source/blender/python/api2_2x/Ipocurve.c
    branches/nurbs/blender/source/blender/python/api2_2x/Ipocurve.h
    branches/nurbs/blender/source/blender/python/api2_2x/Lamp.c
    branches/nurbs/blender/source/blender/python/api2_2x/MTex.c
    branches/nurbs/blender/source/blender/python/api2_2x/MTex.h
    branches/nurbs/blender/source/blender/python/api2_2x/Makefile
    branches/nurbs/blender/source/blender/python/api2_2x/Material.c
    branches/nurbs/blender/source/blender/python/api2_2x/Mathutils.c
    branches/nurbs/blender/source/blender/python/api2_2x/Mathutils.h
    branches/nurbs/blender/source/blender/python/api2_2x/Mesh.c
    branches/nurbs/blender/source/blender/python/api2_2x/Modifier.c
    branches/nurbs/blender/source/blender/python/api2_2x/Object.c
    branches/nurbs/blender/source/blender/python/api2_2x/Particle.c
    branches/nurbs/blender/source/blender/python/api2_2x/Pose.c
    branches/nurbs/blender/source/blender/python/api2_2x/Scene.c
    branches/nurbs/blender/source/blender/python/api2_2x/Text.c
    branches/nurbs/blender/source/blender/python/api2_2x/Text.h
    branches/nurbs/blender/source/blender/python/api2_2x/Text3d.c
    branches/nurbs/blender/source/blender/python/api2_2x/Texture.c
    branches/nurbs/blender/source/blender/python/api2_2x/Window.c
    branches/nurbs/blender/source/blender/python/api2_2x/World.c
    branches/nurbs/blender/source/blender/python/api2_2x/bpy_data.c
    branches/nurbs/blender/source/blender/python/api2_2x/doc/API_intro.py
    branches/nurbs/blender/source/blender/python/api2_2x/doc/API_related.py
    branches/nurbs/blender/source/blender/python/api2_2x/doc/Blender.py
    branches/nurbs/blender/source/blender/python/api2_2x/doc/Draw.py
    branches/nurbs/blender/source/blender/python/api2_2x/doc/Group.py
    branches/nurbs/blender/source/blender/python/api2_2x/doc/Lamp.py
    branches/nurbs/blender/source/blender/python/api2_2x/doc/Material.py
    branches/nurbs/blender/source/blender/python/api2_2x/doc/Mathutils.py
    branches/nurbs/blender/source/blender/python/api2_2x/doc/Mesh.py
    branches/nurbs/blender/source/blender/python/api2_2x/doc/Modifier.py
    branches/nurbs/blender/source/blender/python/api2_2x/doc/Object.py
    branches/nurbs/blender/source/blender/python/api2_2x/doc/Text.py
    branches/nurbs/blender/source/blender/python/api2_2x/doc/Text3d.py
    branches/nurbs/blender/source/blender/python/api2_2x/doc/Texture.py
    branches/nurbs/blender/source/blender/python/api2_2x/doc/World.py
    branches/nurbs/blender/source/blender/python/api2_2x/gen_utils.h
    branches/nurbs/blender/source/blender/python/api2_2x/sceneRender.c
    branches/nurbs/blender/source/blender/python/api2_2x/sceneSequence.c
    branches/nurbs/blender/source/blender/python/api2_2x/vector.c
    branches/nurbs/blender/source/blender/python/api2_2x/vector.h
    branches/nurbs/blender/source/blender/radiosity/CMakeLists.txt
    branches/nurbs/blender/source/blender/radiosity/SConscript
    branches/nurbs/blender/source/blender/radiosity/intern/source/Makefile
    branches/nurbs/blender/source/blender/radiosity/intern/source/radnode.c
    branches/nurbs/blender/source/blender/radiosity/intern/source/radpreprocess.c
    branches/nurbs/blender/source/blender/readblenfile/intern/BLO_readblenfile.c
    branches/nurbs/blender/source/blender/render/CMakeLists.txt
    branches/nurbs/blender/source/blender/render/SConscript
    branches/nurbs/blender/source/blender/render/extern/include/RE_pipeline.h
    branches/nurbs/blender/source/blender/render/intern/include/render_types.h
    branches/nurbs/blender/source/blender/render/intern/include/sunsky.h
    branches/nurbs/blender/source/blender/render/intern/include/texture.h
    branches/nurbs/blender/source/blender/render/intern/source/convertblender.c
    branches/nurbs/blender/source/blender/render/intern/source/imagetexture.c
    branches/nurbs/blender/source/blender/render/intern/source/occlusion.c
    branches/nurbs/blender/source/blender/render/intern/source/pipeline.c
    branches/nurbs/blender/source/blender/render/intern/source/pixelshading.c
    branches/nurbs/blender/source/blender/render/intern/source/rayshade.c
    branches/nurbs/blender/source/blender/render/intern/source/rendercore.c
    branches/nurbs/blender/source/blender/render/intern/source/renderdatabase.c
    branches/nurbs/blender/source/blender/render/intern/source/shadbuf.c
    branches/nurbs/blender/source/blender/render/intern/source/shadeinput.c
    branches/nurbs/blender/source/blender/render/intern/source/shadeoutput.c
    branches/nurbs/blender/source/blender/render/intern/source/strand.c
    branches/nurbs/blender/source/blender/render/intern/source/sunsky.c
    branches/nurbs/blender/source/blender/render/intern/source/texture.c
    branches/nurbs/blender/source/blender/render/intern/source/zbuf.c
    branches/nurbs/blender/source/blender/src/CMakeLists.txt
    branches/nurbs/blender/source/blender/src/Makefile
    branches/nurbs/blender/source/blender/src/SConscript
    branches/nurbs/blender/source/blender/src/blenderbuttons.c
    branches/nurbs/blender/source/blender/src/buttons_editing.c
    branches/nurbs/blender/source/blender/src/buttons_logic.c
    branches/nurbs/blender/source/blender/src/buttons_object.c
    branches/nurbs/blender/source/blender/src/buttons_scene.c
    branches/nurbs/blender/source/blender/src/buttons_shading.c
    branches/nurbs/blender/source/blender/src/drawaction.c
    branches/nurbs/blender/source/blender/src/drawarmature.c
    branches/nurbs/blender/source/blender/src/drawgpencil.c
    branches/nurbs/blender/source/blender/src/drawimage.c
    branches/nurbs/blender/source/blender/src/drawipo.c
    branches/nurbs/blender/source/blender/src/drawmesh.c
    branches/nurbs/blender/source/blender/src/drawnode.c
    branches/nurbs/blender/source/blender/src/drawobject.c
    branches/nurbs/blender/source/blender/src/drawseq.c
    branches/nurbs/blender/source/blender/src/drawtext.c
    branches/nurbs/blender/source/blender/src/drawview.c
    branches/nurbs/blender/source/blender/src/editaction.c
    branches/nurbs/blender/source/blender/src/editarmature.c
    branches/nurbs/blender/source/blender/src/editcurve.c
    branches/nurbs/blender/source/blender/src/editdeform.c
    branches/nurbs/blender/source/blender/src/editface.c
    branches/nurbs/blender/source/blender/src/editimasel.c
    branches/nurbs/blender/source/blender/src/editipo.c
    branches/nurbs/blender/source/blender/src/editipo_lib.c
    branches/nurbs/blender/source/blender/src/editipo_mods.c
    branches/nurbs/blender/source/blender/src/editkey.c
    branches/nurbs/blender/source/blender/src/editlattice.c
    branches/nurbs/blender/source/blender/src/editmesh.c
    branches/nurbs/blender/source/blender/src/editmesh_add.c
    branches/nurbs/blender/source/blender/src/editmesh_lib.c
    branches/nurbs/blender/source/blender/src/editmesh_loop.c
    branches/nurbs/blender/source/blender/src/editmesh_mods.c
    branches/nurbs/blender/source/blender/src/editmesh_tools.c
    branches/nurbs/blender/source/blender/src/editmode_undo.c
    branches/nurbs/blender/source/blender/src/editnode.c
    branches/nurbs/blender/source/blender/src/editobject.c
    branches/nurbs/blender/source/blender/src/editscreen.c
    branches/nurbs/blender/source/blender/src/editseq.c
    branches/nurbs/blender/source/blender/src/editsima.c
    branches/nurbs/blender/source/blender/src/editsound.c
    branches/nurbs/blender/source/blender/src/editview.c
    branches/nurbs/blender/source/blender/src/filelist.c
    branches/nurbs/blender/source/blender/src/filesel.c
    branches/nurbs/blender/source/blender/src/fluidsim.c
    branches/nurbs/blender/source/blender/src/glutil.c
    branches/nurbs/blender/source/blender/src/gpencil.c
    branches/nurbs/blender/source/blender/src/header_buttonswin.c
    branches/nurbs/blender/source/blender/src/header_image.c
    branches/nurbs/blender/source/blender/src/header_info.c
    branches/nurbs/blender/source/blender/src/header_ipo.c
    branches/nurbs/blender/source/blender/src/header_node.c
    branches/nurbs/blender/source/blender/src/header_oops.c
    branches/nurbs/blender/source/blender/src/header_script.c
    branches/nurbs/blender/source/blender/src/header_text.c
    branches/nurbs/blender/source/blender/src/header_view3d.c
    branches/nurbs/blender/source/blender/src/headerbuttons.c
    branches/nurbs/blender/source/blender/src/imagepaint.c
    branches/nurbs/blender/source/blender/src/interface.c
    branches/nurbs/blender/source/blender/src/keyval.c
    branches/nurbs/blender/source/blender/src/meshlaplacian.c
    branches/nurbs/blender/source/blender/src/meshtools.c
    branches/nurbs/blender/source/blender/src/mywindow.c
    branches/nurbs/blender/source/blender/src/outliner.c
    branches/nurbs/blender/source/blender/src/parametrizer.c
    branches/nurbs/blender/source/blender/src/parametrizer.h
    branches/nurbs/blender/source/blender/src/parametrizer_intern.h
    branches/nurbs/blender/source/blender/src/playanim.c
    branches/nurbs/blender/source/blender/src/poselib.c
    branches/nurbs/blender/source/blender/src/poseobject.c
    branches/nurbs/blender/source/blender/src/preview.blend.c
    branches/nurbs/blender/source/blender/src/previewrender.c
    branches/nurbs/blender/source/blender/src/renderwin.c
    branches/nurbs/blender/source/blender/src/resources.c
    branches/nurbs/blender/source/blender/src/retopo.c
    branches/nurbs/blender/source/blender/src/sculptmode.c
    branches/nurbs/blender/source/blender/src/seqaudio.c
    branches/nurbs/blender/source/blender/src/seqscopes.c
    branches/nurbs/blender/source/blender/src/sequence.c
    branches/nurbs/blender/source/blender/src/space.c
    branches/nurbs/blender/source/blender/src/splash.jpg.c
    branches/nurbs/blender/source/blender/src/toets.c
    branches/nurbs/blender/source/blender/src/toolbox.c
    branches/nurbs/blender/source/blender/src/transform.c
    branches/nurbs/blender/source/blender/src/transform_conversions.c
    branches/nurbs/blender/source/blender/src/transform_generics.c
    branches/nurbs/blender/source/blender/src/transform_numinput.c
    branches/nurbs/blender/source/blender/src/transform_orientations.c
    branches/nurbs/blender/source/blender/src/transform_snap.c
    branches/nurbs/blender/source/blender/src/usiblender.c
    branches/nurbs/blender/source/blender/src/verse_image.c
    branches/nurbs/blender/source/blender/src/view.c
    branches/nurbs/blender/source/blender/src/writeimage.c
    branches/nurbs/blender/source/blender/yafray/intern/export_File.cpp
    branches/nurbs/blender/source/blender/yafray/intern/export_Plugin.cpp
    branches/nurbs/blender/source/creator/CMakeLists.txt
    branches/nurbs/blender/source/creator/Makefile
    branches/nurbs/blender/source/creator/SConscript
    branches/nurbs/blender/source/creator/creator.c
    branches/nurbs/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/nurbs/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/nurbs/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/nurbs/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.h
    branches/nurbs/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/nurbs/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/nurbs/blender/source/gameengine/BlenderRoutines/Makefile
    branches/nurbs/blender/source/gameengine/BlenderRoutines/SConscript
    branches/nurbs/blender/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/nurbs/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/nurbs/blender/source/gameengine/Converter/BL_ArmatureObject.h
    branches/nurbs/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/nurbs/blender/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/nurbs/blender/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/nurbs/blender/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/nurbs/blender/source/gameengine/Converter/BL_MeshDeformer.h
    branches/nurbs/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/nurbs/blender/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/nurbs/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/nurbs/blender/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/nurbs/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/nurbs/blender/source/gameengine/Converter/BL_SkinDeformer.h
    branches/nurbs/blender/source/gameengine/Converter/BL_SkinMeshObject.cpp
    branches/nurbs/blender/source/gameengine/Converter/BL_SkinMeshObject.h
    branches/nurbs/blender/source/gameengine/Converter/CMakeLists.txt
    branches/nurbs/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/nurbs/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/nurbs/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/nurbs/blender/source/gameengine/Converter/KX_ConvertProperties.cpp
    branches/nurbs/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/nurbs/blender/source/gameengine/Converter/KX_ConvertSensors.h
    branches/nurbs/blender/source/gameengine/Converter/Makefile
    branches/nurbs/blender/source/gameengine/Converter/SConscript
    branches/nurbs/blender/source/gameengine/Expressions/InputParser.cpp
    branches/nurbs/blender/source/gameengine/Expressions/ListValue.cpp
    branches/nurbs/blender/source/gameengine/Expressions/Makefile
    branches/nurbs/blender/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/nurbs/blender/source/gameengine/Expressions/PyObjectPlus.h
    branches/nurbs/blender/source/gameengine/Expressions/Value.cpp
    branches/nurbs/blender/source/gameengine/Expressions/Value.h
    branches/nurbs/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
    branches/nurbs/blender/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
    branches/nurbs/blender/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/Joystick/SCA_JoystickPrivate.h
    branches/nurbs/blender/source/gameengine/GameLogic/Makefile
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_IController.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_ISensor.h
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_JoystickManager.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_JoystickManager.h
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_JoystickSensor.h
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_LogicManager.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_LogicManager.h
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_PythonController.h
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SConscript
    branches/nurbs/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
    branches/nurbs/blender/source/gameengine/GamePlayer/CMakeLists.txt
    branches/nurbs/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/nurbs/blender/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
    branches/nurbs/blender/source/gameengine/GamePlayer/common/GPC_RawImage.h
    branches/nurbs/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/nurbs/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.h
    branches/nurbs/blender/source/gameengine/GamePlayer/common/Makefile
    branches/nurbs/blender/source/gameengine/GamePlayer/common/SConscript
    branches/nurbs/blender/source/gameengine/GamePlayer/common/unix/GPU_PolygonMaterial.h
    branches/nurbs/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/nurbs/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/nurbs/blender/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/nurbs/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/nurbs/blender/source/gameengine/GamePlayer/ghost/Makefile
    branches/nurbs/blender/source/gameengine/GamePlayer/ghost/SConscript
    branches/nurbs/blender/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
    branches/nurbs/blender/source/gameengine/GamePlayer/netscape/test/resource/test.html
    branches/nurbs/blender/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/nurbs/blender/source/gameengine/Ketsji/BL_Material.h
    branches/nurbs/blender/source/gameengine/Ketsji/BL_Shader.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/BL_Shader.h
    branches/nurbs/blender/source/gameengine/Ketsji/CMakeLists.txt
    branches/nurbs/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_CameraActuator.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_ConstraintActuator.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_GameActuator.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_GameActuator.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_GameObject.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_IPO_SGController.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_Light.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_Light.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_MeshProxy.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_PythonInit.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_RayCast.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_RayCast.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_RaySensor.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_Scene.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_Scene.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_StateActuator.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/nurbs/blender/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_VisibilityActuator.h
    branches/nurbs/blender/source/gameengine/Ketsji/Makefile
    branches/nurbs/blender/source/gameengine/Ketsji/SConscript
    branches/nurbs/blender/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
    branches/nurbs/blender/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
    branches/nurbs/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/nurbs/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/nurbs/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/nurbs/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/nurbs/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/nurbs/blender/source/gameengine/Physics/Bullet/Makefile
    branches/nurbs/blender/source/gameengine/Physics/Bullet/SConscript
    branches/nurbs/blender/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
    branches/nurbs/blender/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
    branches/nurbs/blender/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
    branches/nurbs/blender/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
    branches/nurbs/blender/source/gameengine/Physics/common/PHY_DynamicTypes.h
    branches/nurbs/blender/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/nurbs/blender/source/gameengine/PyDoc/BL_ActionActuator.py
    branches/nurbs/blender/source/gameengine/PyDoc/BL_ShapeActionActuator.py
    branches/nurbs/blender/source/gameengine/PyDoc/GameKeys.py
    branches/nurbs/blender/source/gameengine/PyDoc/GameLogic.py
    branches/nurbs/blender/source/gameengine/PyDoc/KX_CameraActuator.py
    branches/nurbs/blender/source/gameengine/PyDoc/KX_GameObject.py
    branches/nurbs/blender/source/gameengine/PyDoc/KX_MeshProxy.py
    branches/nurbs/blender/source/gameengine/PyDoc/KX_ObjectActuator.py
    branches/nurbs/blender/source/gameengine/PyDoc/KX_ParentActuator.py
    branches/nurbs/blender/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
    branches/nurbs/blender/source/gameengine/PyDoc/KX_SCA_ReplaceMeshActuator.py
    branches/nurbs/blender/source/gameengine/PyDoc/KX_TrackToActuator.py
    branches/nurbs/blender/source/gameengine/PyDoc/Rasterizer.py
    branches/nurbs/blender/source/gameengine/PyDoc/SCA_ISensor.py
    branches/nurbs/blender/source/gameengine/Rasterizer/Makefile
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_IRenderTools.cpp
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_Polygon.cpp
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_Polygon.h
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/nurbs/blender/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/nurbs/blender/source/gameengine/Rasterizer/SConscript
    branches/nurbs/blender/source/kernel/CMakeLists.txt
    branches/nurbs/blender/source/kernel/SConscript
    branches/nurbs/blender/source/kernel/gen_system/GEN_HashedPtr.cpp
    branches/nurbs/blender/source/kernel/gen_system/GEN_Map.h
    branches/nurbs/blender/source/kernel/gen_system/Makefile
    branches/nurbs/blender/source/nan_definitions.mk
    branches/nurbs/blender/tools/Blender.py
    branches/nurbs/blender/tools/btools.py

Added Paths:
-----------
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btClipPolygon.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactMassUtil.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGeometryOperations.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_array.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_bitset.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_box_collision.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_clip_polygon.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_geom_types.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_geometry.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_hash_table.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_linear_math.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_math.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/Jamfile
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btConvexHull.cpp
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btConvexHull.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btHashMap.h
    branches/nurbs/blender/extern/bullet2/src/LinearMath/btPoolAllocator.h
    branches/nurbs/blender/intern/elbeem/intern/controlparticles.cpp
    branches/nurbs/blender/intern/elbeem/intern/controlparticles.h
    branches/nurbs/blender/intern/elbeem/intern/elbeem_control.cpp
    branches/nurbs/blender/intern/elbeem/intern/elbeem_control.h
    branches/nurbs/blender/intern/elbeem/intern/mvmcoords.cpp
    branches/nurbs/blender/intern/elbeem/intern/mvmcoords.h
    branches/nurbs/blender/intern/elbeem/intern/solver_control.cpp
    branches/nurbs/blender/intern/elbeem/intern/solver_control.h
    branches/nurbs/blender/intern/guardedalloc/BLO_sys_types.h
    branches/nurbs/blender/intern/opennl/superlu/BLO_sys_types.h
    branches/nurbs/blender/projectfiles_vc7/blender/gpu/
    branches/nurbs/blender/projectfiles_vc7/blender/gpu/BL_gpu.vcproj
    branches/nurbs/blender/release/scripts/bpymodules/BPyTextPlugin.py
    branches/nurbs/blender/release/scripts/flt_dofedit.py
    branches/nurbs/blender/release/scripts/flt_lodedit.py
    branches/nurbs/blender/release/scripts/ms3d_import_ascii.py
    branches/nurbs/blender/release/scripts/scripttemplate_gamelogic.py
    branches/nurbs/blender/release/scripts/scripttemplate_gamelogic_basic.py
    branches/nurbs/blender/release/scripts/scripttemplate_text_plugin.py
    branches/nurbs/blender/release/scripts/textplugin_functiondocs.py
    branches/nurbs/blender/release/scripts/textplugin_imports.py
    branches/nurbs/blender/release/scripts/textplugin_membersuggest.py
    branches/nurbs/blender/release/scripts/textplugin_outliner.py
    branches/nurbs/blender/release/scripts/textplugin_suggest.py
    branches/nurbs/blender/release/scripts/textplugin_templates.py
    branches/nurbs/blender/release/text/release_247.txt
    branches/nurbs/blender/source/blender/blenkernel/BKE_fluidsim.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_shrinkwrap.h
    branches/nurbs/blender/source/blender/blenkernel/BKE_suggestions.h
    branches/nurbs/blender/source/blender/blenkernel/intern/fluidsim.c
    branches/nurbs/blender/source/blender/blenkernel/intern/shrinkwrap.c
    branches/nurbs/blender/source/blender/blenkernel/intern/suggestions.c
    branches/nurbs/blender/source/blender/gpu/
    branches/nurbs/blender/source/blender/gpu/CMakeLists.txt
    branches/nurbs/blender/source/blender/gpu/GPU_draw.h
    branches/nurbs/blender/source/blender/gpu/GPU_extensions.h
    branches/nurbs/blender/source/blender/gpu/GPU_material.h
    branches/nurbs/blender/source/blender/gpu/Makefile
    branches/nurbs/blender/source/blender/gpu/SConscript
    branches/nurbs/blender/source/blender/gpu/intern/
    branches/nurbs/blender/source/blender/gpu/intern/Makefile
    branches/nurbs/blender/source/blender/gpu/intern/gpu_codegen.c
    branches/nurbs/blender/source/blender/gpu/intern/gpu_codegen.h
    branches/nurbs/blender/source/blender/gpu/intern/gpu_draw.c
    branches/nurbs/blender/source/blender/gpu/intern/gpu_extensions.c
    branches/nurbs/blender/source/blender/gpu/intern/gpu_material.c
    branches/nurbs/blender/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/nurbs/blender/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/nurbs/blender/source/blender/gpu/intern/gpu_shader_vertex.glsl
    branches/nurbs/blender/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
    branches/nurbs/blender/source/blender/include/BIF_keyframing.h
    branches/nurbs/blender/source/blender/src/keyframing.c
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/nurbs/blender/source/gameengine/GameLogic/SCA_DelaySensor.h
    branches/nurbs/blender/source/gameengine/GamePlayer/xembed/
    branches/nurbs/blender/source/gameengine/GamePlayer/xembed/CMakeLists.txt
    branches/nurbs/blender/source/gameengine/GamePlayer/xembed/UnixShell.c
    branches/nurbs/blender/source/gameengine/GamePlayer/xembed/blender_plugin_types.h
    branches/nurbs/blender/source/gameengine/GamePlayer/xembed/npunix.c
    branches/nurbs/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/nurbs/blender/source/gameengine/Ketsji/KX_PolyProxy.h
    branches/nurbs/blender/source/gameengine/PyDoc/KX_PolyProxy.py
    branches/nurbs/blender/source/gameengine/PyDoc/SCA_DelaySensor.py

Removed Paths:
-------------
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btClipPolygon.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactMassUtil.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btGeometryOperations.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_array.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_bitset.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_box_collision.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_clip_polygon.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_geom_types.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_geometry.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_hash_table.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_linear_math.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_math.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/Jamfile
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
    branches/nurbs/blender/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
    branches/nurbs/blender/intern/elbeem/intern/elbeem.h
    branches/nurbs/blender/projectfiles_vc7/blender/gpu/BL_gpu.vcproj
    branches/nurbs/blender/release/text/release_246.txt
    branches/nurbs/blender/source/blender/gpu/CMakeLists.txt
    branches/nurbs/blender/source/blender/gpu/GPU_draw.h
    branches/nurbs/blender/source/blender/gpu/GPU_extensions.h
    branches/nurbs/blender/source/blender/gpu/GPU_material.h
    branches/nurbs/blender/source/blender/gpu/Makefile
    branches/nurbs/blender/source/blender/gpu/SConscript
    branches/nurbs/blender/source/blender/gpu/intern/
    branches/nurbs/blender/source/blender/gpu/intern/Makefile
    branches/nurbs/blender/source/blender/gpu/intern/gpu_codegen.c
    branches/nurbs/blender/source/blender/gpu/intern/gpu_codegen.h
    branches/nurbs/blender/source/blender/gpu/intern/gpu_draw.c
    branches/nurbs/blender/source/blender/gpu/intern/gpu_extensions.c
    branches/nurbs/blender/source/blender/gpu/intern/gpu_material.c
    branches/nurbs/blender/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/nurbs/blender/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/nurbs/blender/source/blender/gpu/intern/gpu_shader_vertex.glsl
    branches/nurbs/blender/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
    branches/nurbs/blender/source/blender/include/license_key.h
    branches/nurbs/blender/source/blender/src/cre/license.jpeg.c
    branches/nurbs/blender/source/blender/src/cre/license_key.c
    branches/nurbs/blender/source/blender/src/pub/license_key.c
    branches/nurbs/blender/source/gameengine/GamePlayer/xembed/CMakeLists.txt
    branches/nurbs/blender/source/gameengine/GamePlayer/xembed/UnixShell.c
    branches/nurbs/blender/source/gameengine/GamePlayer/xembed/blender_plugin_types.h
    branches/nurbs/blender/source/gameengine/GamePlayer/xembed/npunix.c

Modified: branches/nurbs/blender/CMake/macros.cmake
===================================================================
--- branches/nurbs/blender/CMake/macros.cmake	2008-09-27 22:01:26 UTC (rev 16773)
+++ branches/nurbs/blender/CMake/macros.cmake	2008-09-28 01:39:48 UTC (rev 16774)
@@ -38,6 +38,10 @@
 ENDMACRO(BLENDERLIB)
 
 MACRO(SETUP_LIBDIRS)
+  # see "cmake --help-policy CMP0003"
+  if(COMMAND cmake_policy)
+    CMAKE_POLICY(SET CMP0003 NEW)
+  endif(COMMAND cmake_policy)
   LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
   IF(WITH_INTERNATIONAL)
     LINK_DIRECTORIES(${GETTEXT_LIBPATH})

Modified: branches/nurbs/blender/CMakeLists.txt
===================================================================
--- branches/nurbs/blender/CMakeLists.txt	2008-09-27 22:01:26 UTC (rev 16773)
+++ branches/nurbs/blender/CMakeLists.txt	2008-09-28 01:39:48 UTC (rev 16774)
@@ -63,8 +63,8 @@
 OPTION(WITH_OPENEXR		"Enable OpenEXR Support (http://www.openexr.com)"	ON)
 OPTION(WITH_FFMPEG		"Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"	OFF)
 OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
-OPTION(YESIAMSTUPID		"Enable execution on 64-bit platforms"			OFF)
 OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
+OPTION(WITH_WEBPLUGIN		"Enable Web Plugin (Mozilla-Unix only)"			OFF)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -249,7 +249,11 @@
   
   SET(GETTEXT ${LIBDIR}/gettext)
   SET(GETTEXT_INC ${GETTEXT}/include)
-  SET(GETTEXT_LIB gnu_gettext)
+  IF(CMAKE_CL_64)
+  	SET(GETTEXT_LIB gettextlib)
+  ELSE(CMAKE_CL_64)
+  	SET(GETTEXT_LIB gnu_gettext)
+  ENDIF(CMAKE_CL_64)
   SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
 
   SET(FREETYPE ${LIBDIR}/freetype)
@@ -280,7 +284,12 @@
   SET(FFMPEG_LIB avcodec-51 avformat-52 avdevice-52 avutil-49 swscale-0)
   SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 
+  IF(CMAKE_CL_64)
+  SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
+  ELSE(CMAKE_CL_64)
   SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
+  ENDIF(CMAKE_CL_64)
+  
   IF(WITH_OPENAL)
     SET(LLIBS ${LLIBS} dxguid)
   ENDIF(WITH_OPENAL)
@@ -318,7 +327,7 @@
   SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
   IF(CMAKE_CL_64)
-  SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+  SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
   ELSE(CMAKE_CL_64)
   SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
   ENDIF(CMAKE_CL_64)
@@ -449,6 +458,13 @@
 SUBDIRS(source/creator)
 
 #-----------------------------------------------------------------------------
+# Blender WebPlugin
+IF(WITH_WEBPLUGIN) 
+  SET(MOZILLA_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path")
+  SET(WITH_PLAYER ON)
+ENDIF(WITH_WEBPLUGIN)
+
+#-----------------------------------------------------------------------------
 # Blender Player
 IF(WITH_PLAYER)
   SUBDIRS(blenderplayer)

Modified: branches/nurbs/blender/SConstruct
===================================================================
--- branches/nurbs/blender/SConstruct	2008-09-27 22:01:26 UTC (rev 16773)
+++ branches/nurbs/blender/SConstruct	2008-09-28 01:39:48 UTC (rev 16774)
@@ -241,6 +241,13 @@
     for l in B.quickdebug:
         print "\t" + l
 
+# remove stdc++ from LLIBS if we are building a statc linked CXXFLAGS
+if env['WITH_BF_STATICCXX']:
+    if 'stdc++' in env['LLIBS']:
+        env['LLIBS'] = env['LLIBS'].replace('stdc++', ' ')
+    else:
+        print '\tcould not remove stdc++ library from LLIBS, WITH_BF_STATICCXX may not work for your platform'
+
 # check target for blenderplayer. Set WITH_BF_PLAYER if found on cmdline
 if 'blenderplayer' in B.targets:
     env['WITH_BF_PLAYER'] = True
@@ -248,6 +255,31 @@
 if 'blendernogame' in B.targets:
     env['WITH_BF_GAMEENGINE'] = False
 
+if 'blenderlite' in B.targets:
+    env['WITH_BF_GAMEENGINE'] = False
+    env['WITH_BF_OPENAL'] = False
+    env['WITH_BF_OPENEXR'] = False
+    env['WITH_BF_ICONV'] = False
+    env['WITH_BF_INTERNATIONAL'] = False
+    env['WITH_BF_OPENJPEG'] = False
+    env['WITH_BF_FFMPEG'] = False
+    env['WITH_BF_QUICKTIME'] = False
+    env['WITH_BF_YAFRAY'] = False
+    env['WITH_BF_REDCODE'] = False
+    env['WITH_BF_FTGL'] = False
+    env['WITH_BF_DDS'] = False
+    env['WITH_BF_ZLIB'] = False
+    env['WITH_BF_SDL'] = False
+    env['WITH_BF_JPEG'] = False
+    env['WITH_BF_PNG'] = False
+    env['WITH_BF_ODE'] = False
+    env['WITH_BF_BULLET'] = False
+    env['WITH_BF_BINRELOC'] = False
+    env['BF_BUILDINFO'] = False
+    env['BF_NO_ELBEEM'] = True
+    
+
+
 # lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
 #B.root_build_dir = B.arguments.get('BF_BUILDDIR', '..'+os.sep+'build'+os.sep+platform+os.sep)
 B.root_build_dir = env['BF_BUILDDIR']
@@ -390,6 +422,26 @@
             source=[dp+os.sep+f for f in df]
             scriptinstall.append(env.Install(dir=dir,source=source))
 
+#-- icons
+if env['OURPLATFORM']=='linux2':
+	iconlist = []
+	icontargetlist = []
+
+	for tp, tn, tf in os.walk('release/freedesktop/icons'):
+		if 'CVS' in tn:
+			tn.remove('CVS')
+		if '.svn' in tn:
+			tn.remove('.svn')
+		for f in tf:
+			print ">>>", env['BF_INSTALLDIR'], tp, f
+			iconlist.append(tp+os.sep+f)
+			icontargetlist.append(env['BF_INSTALLDIR']+tp[19:]+os.sep+f)
+
+	iconinstall = []
+	for targetdir,srcfile in zip(icontargetlist, iconlist):
+		td, tf = os.path.split(targetdir)
+		iconinstall.append(env.Install(dir=td, source=srcfile))
+
 #-- plugins
 pluglist = []
 plugtargetlist = []
@@ -438,6 +490,8 @@
 
 if  env['OURPLATFORM']=='darwin':
         allinstall = [blenderinstall, plugininstall, textinstall]
+elif env['OURPLATFORM']=='linux2':
+        allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall]
 else:
         allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
 
@@ -488,6 +542,10 @@
     blendernogame = env.Alias('blendernogame', B.program_list)
     Depends(blendernogame,installtarget)
 
+if 'blenderlite' in B.targets:
+	blenderlite = env.Alias('blenderlite', B.program_list)
+	Depends(blenderlite,installtarget)
+
 Depends(nsiscmd, allinstall)
 
 Default(B.program_list)

Modified: branches/nurbs/blender/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)

Modified: branches/nurbs/blender/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)

Modified: branches/nurbs/blender/blenderplayer/CMakeLists.txt
===================================================================
--- branches/nurbs/blender/blenderplayer/CMakeLists.txt	2008-09-27 22:01:26 UTC (rev 16773)
+++ branches/nurbs/blender/blenderplayer/CMakeLists.txt	2008-09-28 01:39:48 UTC (rev 16774)
@@ -86,10 +86,12 @@
     bf_oglrasterizer 
     bf_expressions 
     bf_scenegraph 
+	bf_IK
     bf_moto 
     bf_soundsystem 
     bf_kernel 
     bf_nodes
+	bf_gpu
     bf_imbuf
     bf_avi 
     kx_network 

Modified: branches/nurbs/blender/config/darwin-config.py
===================================================================
--- branches/nurbs/blender/config/darwin-config.py	2008-09-27 22:01:26 UTC (rev 16773)
+++ branches/nurbs/blender/config/darwin-config.py	2008-09-28 01:39:48 UTC (rev 16774)
@@ -87,11 +87,19 @@
 	BF_OPENAL = '#../lib/darwin-8.0.0-powerpc/openal'
 else :
 	BF_OPENAL = LIBDIR + '/openal'
-	
+
+WITH_BF_STATICOPENAL = 'false'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
 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'
+
 WITH_BF_SDL = 'true'
 BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
@@ -102,10 +110,13 @@
 BF_FMOD = LIBDIR + '/fmod'
 
 WITH_BF_OPENEXR = 'true'
+WITH_BF_STATICOPENEXR = 'false'
 BF_OPENEXR = '${LCGDIR}/openexr'
 BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
 BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
 BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
 
 WITH_BF_DDS = 'true'
 
@@ -143,7 +154,6 @@
 
 WITH_BF_GAMEENGINE='true'
 WITH_BF_PLAYER='true'
-WITH_BF_GLEXT= '1'
 
 WITH_BF_ODE = 'false'
 BF_ODE = LIBDIR + '/ode'

Modified: branches/nurbs/blender/config/linux2-config.py
===================================================================
--- branches/nurbs/blender/config/linux2-config.py	2008-09-27 22:01:26 UTC (rev 16773)
+++ branches/nurbs/blender/config/linux2-config.py	2008-09-28 01:39:48 UTC (rev 16774)
@@ -6,19 +6,29 @@
 
 BF_PYTHON = '/usr'
 BF_PYTHON_VERSION = '2.5'
+WITH_BF_STATICPYTHON = 'false'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
 BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
 BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}.a'
 
 WITH_BF_OPENAL = 'true'
+WITH_BF_STATICOPENAL = 'false'
 BF_OPENAL = '/usr'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
 BF_OPENAL_LIB = 'openal'
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
 # some distros have a separate libalut
 # if you get linker complaints, you need to uncomment the line below
 # BF_OPENAL_LIB = 'openal alut'  
+# BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a ${BF_OPENAL}/lib/libalut.a'
 
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = 'false'
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
 WITH_BF_SDL = 'true'
 BF_SDL = '/usr' #$(shell sdl-config --prefix)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list