[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11306] branches/soc-2007-joeedh: merge with trunk at revision 11304.
Joseph Eagar
joeedh at gmail.com
Wed Jul 18 18:02:34 CEST 2007
Revision: 11306
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11306
Author: joeedh
Date: 2007-07-18 18:02:34 +0200 (Wed, 18 Jul 2007)
Log Message:
-----------
merge with trunk at revision 11304.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11304
Modified Paths:
--------------
branches/soc-2007-joeedh/CMakeLists.txt
branches/soc-2007-joeedh/SConstruct
branches/soc-2007-joeedh/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/soc-2007-joeedh/bin/.blender/locale/it/LC_MESSAGES/blender.mo
branches/soc-2007-joeedh/config/darwin-config.py
branches/soc-2007-joeedh/config/linux2-config.py
branches/soc-2007-joeedh/config/linuxcross-config.py
branches/soc-2007-joeedh/config/openbsd3-config.py
branches/soc-2007-joeedh/config/sunos5-config.py
branches/soc-2007-joeedh/config/win32-mingw-config.py
branches/soc-2007-joeedh/config/win32-vc-config.py
branches/soc-2007-joeedh/doc/blender-scons.txt
branches/soc-2007-joeedh/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionMargin.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
branches/soc-2007-joeedh/extern/bullet2/src/Jamfile
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btAabbUtil2.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btAlignedAllocator.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btDefaultMotionState.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btGeometryUtil.cpp
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btGeometryUtil.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btIDebugDraw.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btMatrix3x3.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btMotionState.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btPoint3.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btQuadWord.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btQuaternion.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btQuickprof.cpp
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btQuickprof.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btScalar.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btSimdMinMax.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btTransform.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btTransformUtil.h
branches/soc-2007-joeedh/extern/bullet2/src/LinearMath/btVector3.h
branches/soc-2007-joeedh/extern/bullet2/src/SConscript
branches/soc-2007-joeedh/extern/bullet2/src/btBulletCollisionCommon.h
branches/soc-2007-joeedh/extern/bullet2/src/btBulletDynamicsCommon.h
branches/soc-2007-joeedh/extern/verse/Makefile
branches/soc-2007-joeedh/extern/verse/dist/v_connection.c
branches/soc-2007-joeedh/extern/verse/dist/v_network.c
branches/soc-2007-joeedh/intern/boolop/intern/BOP_BSPNode.cpp
branches/soc-2007-joeedh/intern/boolop/intern/BOP_BSPNode.h
branches/soc-2007-joeedh/intern/boolop/intern/BOP_BSPTree.cpp
branches/soc-2007-joeedh/intern/boolop/intern/BOP_BSPTree.h
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Face.cpp
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Face.h
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Face2Face.cpp
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Interface.cpp
branches/soc-2007-joeedh/intern/boolop/intern/BOP_MathUtils.cpp
branches/soc-2007-joeedh/intern/boolop/intern/BOP_MathUtils.h
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Merge.cpp
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Mesh.cpp
branches/soc-2007-joeedh/intern/boolop/intern/BOP_Triangulator.cpp
branches/soc-2007-joeedh/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2007-joeedh/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2007-joeedh/intern/make/msvc_7_0/intern.sln
branches/soc-2007-joeedh/po/fr.po
branches/soc-2007-joeedh/po/it.po
branches/soc-2007-joeedh/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/blender/nodes/nodes.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/blender/src/BL_src.vcproj
branches/soc-2007-joeedh/release/Makefile
branches/soc-2007-joeedh/release/datafiles/blenderbuttons
branches/soc-2007-joeedh/release/scripts/3ds_import.py
branches/soc-2007-joeedh/release/scripts/DirectX8Importer.py
branches/soc-2007-joeedh/release/scripts/bpymodules/BPyRender.py
branches/soc-2007-joeedh/release/scripts/export_mdd.py
branches/soc-2007-joeedh/release/scripts/export_obj.py
branches/soc-2007-joeedh/release/scripts/image_auto_layout.py
branches/soc-2007-joeedh/release/scripts/import_obj.py
branches/soc-2007-joeedh/release/scripts/object_find.py
branches/soc-2007-joeedh/release/scripts/object_random_loc_sz_rot.py
branches/soc-2007-joeedh/release/scripts/scripttemplate_mesh_edit.py
branches/soc-2007-joeedh/release/scripts/slp_import.py
branches/soc-2007-joeedh/release/scripts/uvcalc_lightmap.py
branches/soc-2007-joeedh/release/scripts/vrml97_export.py
branches/soc-2007-joeedh/release/windows/installer/00.sconsblender.nsi
branches/soc-2007-joeedh/source/Makefile
branches/soc-2007-joeedh/source/blender/SConscript
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_constraint.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_curve.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_idprop.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_node.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_object.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_verse.h
branches/soc-2007-joeedh/source/blender/blenkernel/SConscript
branches/soc-2007-joeedh/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/Makefile
branches/soc-2007-joeedh/source/blender/blenkernel/intern/action.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/anim.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/armature.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/constraint.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/curve.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/customdata.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/effect.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/exotic.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/idprop.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/image.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/ipo.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/library.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/mesh.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/modifier.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/nla.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/node.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/object.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/verse_geometry_node.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/verse_node.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/verse_object_node.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/verse_session.c
branches/soc-2007-joeedh/source/blender/blenlib/BLI_arithb.h
branches/soc-2007-joeedh/source/blender/blenlib/BLI_blenlib.h
branches/soc-2007-joeedh/source/blender/blenlib/BLI_editVert.h
branches/soc-2007-joeedh/source/blender/blenlib/intern/arithb.c
branches/soc-2007-joeedh/source/blender/blenloader/intern/readfile.c
branches/soc-2007-joeedh/source/blender/blenloader/intern/writefile.c
branches/soc-2007-joeedh/source/blender/ftfont/intern/FTF_TTFont.cpp
branches/soc-2007-joeedh/source/blender/imbuf/IMB_imbuf.h
branches/soc-2007-joeedh/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2007-joeedh/source/blender/imbuf/SConscript
branches/soc-2007-joeedh/source/blender/imbuf/intern/Makefile
branches/soc-2007-joeedh/source/blender/imbuf/intern/imageprocess.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/readimage.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/util.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/writeimage.c
branches/soc-2007-joeedh/source/blender/include/BDR_drawaction.h
branches/soc-2007-joeedh/source/blender/include/BDR_editcurve.h
branches/soc-2007-joeedh/source/blender/include/BDR_editmball.h
branches/soc-2007-joeedh/source/blender/include/BDR_sculptmode.h
branches/soc-2007-joeedh/source/blender/include/BIF_editaction.h
branches/soc-2007-joeedh/source/blender/include/BIF_editconstraint.h
branches/soc-2007-joeedh/source/blender/include/BIF_editdeform.h
branches/soc-2007-joeedh/source/blender/include/BIF_editseq.h
branches/soc-2007-joeedh/source/blender/include/BIF_editsima.h
branches/soc-2007-joeedh/source/blender/include/BIF_resources.h
branches/soc-2007-joeedh/source/blender/include/BSE_editipo.h
branches/soc-2007-joeedh/source/blender/include/BSE_headerbuttons.h
branches/soc-2007-joeedh/source/blender/include/blendef.h
branches/soc-2007-joeedh/source/blender/include/butspace.h
branches/soc-2007-joeedh/source/blender/include/multires.h
branches/soc-2007-joeedh/source/blender/include/transform.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_ID.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_action_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_material_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_object_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_scene_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_space_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2007-joeedh/source/blender/nodes/CMP_node.h
branches/soc-2007-joeedh/source/blender/nodes/SHD_node.h
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_math.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_setalpha.c
branches/soc-2007-joeedh/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
branches/soc-2007-joeedh/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/soc-2007-joeedh/source/blender/nodes/intern/SHD_util.c
branches/soc-2007-joeedh/source/blender/nodes/intern/SHD_util.h
branches/soc-2007-joeedh/source/blender/python/BPY_extern.h
branches/soc-2007-joeedh/source/blender/python/BPY_interface.c
branches/soc-2007-joeedh/source/blender/python/SConscript
branches/soc-2007-joeedh/source/blender/python/api2_2x/BezTriple.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Blender.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Camera.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Constraint.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/CurNurb.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Curve.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Draw.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Effect.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Font.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Geometry.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Group.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/IDProp.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Image.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Ipo.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Ipocurve.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Ipocurve.h
branches/soc-2007-joeedh/source/blender/python/api2_2x/Key.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Lamp.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Lattice.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Library.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Makefile
branches/soc-2007-joeedh/source/blender/python/api2_2x/Material.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Mathutils.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Mathutils.h
branches/soc-2007-joeedh/source/blender/python/api2_2x/Mesh.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Metaball.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Modifier.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/NLA.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/NMesh.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Noise.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Object.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Pose.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Scene.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Sound.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/SurfNurb.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Sys.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Text.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Text3d.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Texture.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Window.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/World.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/bpy_config.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/bpy_data.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Constraint.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Ipo.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Object.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Render.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Scene.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Texture.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Window.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/gen_library.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/gen_utils.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/gen_utils.h
branches/soc-2007-joeedh/source/blender/python/api2_2x/logic.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/rgbTuple.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/sceneRender.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/sceneSequence.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/windowTheme.c
branches/soc-2007-joeedh/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2007-joeedh/source/blender/render/intern/source/shadeinput.c
branches/soc-2007-joeedh/source/blender/render/intern/source/sss.c
branches/soc-2007-joeedh/source/blender/render/intern/source/texture.c
branches/soc-2007-joeedh/source/blender/src/Makefile
branches/soc-2007-joeedh/source/blender/src/SConscript
branches/soc-2007-joeedh/source/blender/src/blenderbuttons.c
branches/soc-2007-joeedh/source/blender/src/buttons_editing.c
branches/soc-2007-joeedh/source/blender/src/buttons_object.c
branches/soc-2007-joeedh/source/blender/src/buttons_scene.c
branches/soc-2007-joeedh/source/blender/src/buttons_script.c
branches/soc-2007-joeedh/source/blender/src/buttons_shading.c
branches/soc-2007-joeedh/source/blender/src/drawaction.c
branches/soc-2007-joeedh/source/blender/src/drawimage.c
branches/soc-2007-joeedh/source/blender/src/drawipo.c
branches/soc-2007-joeedh/source/blender/src/drawmesh.c
branches/soc-2007-joeedh/source/blender/src/drawnla.c
branches/soc-2007-joeedh/source/blender/src/drawnode.c
branches/soc-2007-joeedh/source/blender/src/drawobject.c
branches/soc-2007-joeedh/source/blender/src/drawoops.c
branches/soc-2007-joeedh/source/blender/src/drawview.c
branches/soc-2007-joeedh/source/blender/src/edit.c
branches/soc-2007-joeedh/source/blender/src/editaction.c
branches/soc-2007-joeedh/source/blender/src/editarmature.c
branches/soc-2007-joeedh/source/blender/src/editconstraint.c
branches/soc-2007-joeedh/source/blender/src/editcurve.c
branches/soc-2007-joeedh/source/blender/src/editdeform.c
branches/soc-2007-joeedh/source/blender/src/editipo.c
branches/soc-2007-joeedh/source/blender/src/editipo_mods.c
branches/soc-2007-joeedh/source/blender/src/editkey.c
branches/soc-2007-joeedh/source/blender/src/editmball.c
branches/soc-2007-joeedh/source/blender/src/editmesh.c
branches/soc-2007-joeedh/source/blender/src/editmesh_tools.c
branches/soc-2007-joeedh/source/blender/src/editnla.c
branches/soc-2007-joeedh/source/blender/src/editnode.c
branches/soc-2007-joeedh/source/blender/src/editobject.c
branches/soc-2007-joeedh/source/blender/src/editscreen.c
branches/soc-2007-joeedh/source/blender/src/editseq.c
branches/soc-2007-joeedh/source/blender/src/editsima.c
branches/soc-2007-joeedh/source/blender/src/filesel.c
branches/soc-2007-joeedh/source/blender/src/header_action.c
branches/soc-2007-joeedh/source/blender/src/header_image.c
branches/soc-2007-joeedh/source/blender/src/header_info.c
branches/soc-2007-joeedh/source/blender/src/header_ipo.c
branches/soc-2007-joeedh/source/blender/src/header_oops.c
branches/soc-2007-joeedh/source/blender/src/header_seq.c
branches/soc-2007-joeedh/source/blender/src/header_text.c
branches/soc-2007-joeedh/source/blender/src/header_view3d.c
branches/soc-2007-joeedh/source/blender/src/interface_draw.c
branches/soc-2007-joeedh/source/blender/src/language.c
branches/soc-2007-joeedh/source/blender/src/multires-firstlevel.c
branches/soc-2007-joeedh/source/blender/src/multires.c
branches/soc-2007-joeedh/source/blender/src/oops.c
branches/soc-2007-joeedh/source/blender/src/playanim.c
branches/soc-2007-joeedh/source/blender/src/renderwin.c
branches/soc-2007-joeedh/source/blender/src/sculptmode.c
branches/soc-2007-joeedh/source/blender/src/space.c
branches/soc-2007-joeedh/source/blender/src/toolbox.c
branches/soc-2007-joeedh/source/blender/src/transform_conversions.c
branches/soc-2007-joeedh/source/blender/src/transform_manipulator.c
branches/soc-2007-joeedh/source/blender/src/verse_mesh.c
branches/soc-2007-joeedh/source/blender/src/writeimage.c
branches/soc-2007-joeedh/source/creator/creator.c
branches/soc-2007-joeedh/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2007-joeedh/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2007-joeedh/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/soc-2007-joeedh/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2007-joeedh/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2007-joeedh/source/gameengine/Physics/common/PHY_DynamicTypes.h
branches/soc-2007-joeedh/source/gameengine/SceneGraph/SG_Node.h
branches/soc-2007-joeedh/source/nan_definitions.mk
branches/soc-2007-joeedh/tools/btools.py
Added Paths:
-----------
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
branches/soc-2007-joeedh/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
branches/soc-2007-joeedh/release/scripts/add_mesh_empty.py
branches/soc-2007-joeedh/release/scripts/export_m3g.py
branches/soc-2007-joeedh/release/scripts/scripttemplate_pyconstraint.py
branches/soc-2007-joeedh/source/blender/blenkernel/intern/verse_method.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/BlockDXT.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/BlockDXT.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Color.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/ColorBlock.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/ColorBlock.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Common.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Image.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Image.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Makefile
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/SConscript
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Stream.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Stream.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/dds_api.h
branches/soc-2007-joeedh/source/blender/include/BSE_editaction_types.h
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
branches/soc-2007-joeedh/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
branches/soc-2007-joeedh/source/blender/src/sculptmode-stroke.c
Removed Paths:
-------------
branches/soc-2007-joeedh/intern/action/
branches/soc-2007-joeedh/intern/csg/
branches/soc-2007-joeedh/intern/keymaker/
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/BlockDXT.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/BlockDXT.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Color.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/ColorBlock.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/ColorBlock.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Common.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Image.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Image.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Makefile
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/SConscript
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Stream.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Stream.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/dds_api.h
Modified: branches/soc-2007-joeedh/CMakeLists.txt
===================================================================
--- branches/soc-2007-joeedh/CMakeLists.txt 2007-07-18 15:27:26 UTC (rev 11305)
+++ branches/soc-2007-joeedh/CMakeLists.txt 2007-07-18 16:02:34 UTC (rev 11306)
@@ -144,6 +144,7 @@
/opt/local/include/freetype2
/opt/csw/include/freetype2
/opt/include/freetype2
+ NO_DEFAULT_PATH
)
SET(FREETYPE_LIB freetype)
Modified: branches/soc-2007-joeedh/SConstruct
===================================================================
--- branches/soc-2007-joeedh/SConstruct 2007-07-18 15:27:26 UTC (rev 11305)
+++ branches/soc-2007-joeedh/SConstruct 2007-07-18 16:02:34 UTC (rev 11306)
@@ -74,8 +74,8 @@
#on defaut white Os X terminal, some colors are totally unlegible
if platform=='darwin':
- B.bc.OKGREEN = '\033[34m'
- B.bc.WARNING = '\033[36m'
+ B.bc.OKGREEN = '\033[34m'
+ B.bc.WARNING = '\033[36m'
# arguments
print B.bc.HEADER+'Command-line arguments'+B.bc.ENDC
@@ -115,6 +115,8 @@
env.Tool('mstoolkit', ['tools'])
else:
env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
+ if env:
+ btools.SetupSpawn(env)
else:
env = BlenderEnvironment(ENV = os.environ)
@@ -122,7 +124,7 @@
print "Could not create a build environment"
Exit()
-env.SConscriptChdir(0)
+
cc = B.arguments.get('CC', None)
cxx = B.arguments.get('CXX', None)
if cc:
@@ -135,54 +137,8 @@
elif env['CC'] in ['gcc'] and sys.platform=='win32':
platform = 'win32-mingw'
-# Fix me!
-#if platform == 'win32-mingw':
-if 0:
- try:
- import win32file
- import win32event
- import win32process
- import win32security
- import string
+env.SConscriptChdir(0)
- slash= re.compile(r"\\")
-
- def myesc(b):
- if b[0]!= "-":
- b = slash.sub(r"\\\\", b[1:-1])
- return "\"" + b + "\""
- else:
- return b
-
- def my_spawn(sh, escape, cmd, args, spawnenv):
- for var in spawnenv:
- spawnenv[var] = spawnenv[var].encode('ascii', 'replace')
-
- sAttrs = win32security.SECURITY_ATTRIBUTES()
- StartupInfo = win32process.STARTUPINFO()
- if cmd=='ar' and args[1]=='r':
- args[1] = '-r'
- newargs = string.join(map(myesc, args[1:]), ' ')
- cmdline = cmd + " " + newargs
-
- # check for any special operating system commands
- if cmd == 'del':
- for arg in args[1:]:
- win32file.DeleteFile(arg)
- exit_code = 0
- else:
- # otherwise execute the command.
- hProcess, hThread, dwPid, dwTid = win32process.CreateProcess(None, cmdline, None, None, 1, 0, spawnenv, None, StartupInfo)
- win32event.WaitForSingleObject(hProcess, win32event.INFINITE)
- exit_code = win32process.GetExitCodeProcess(hProcess)
- win32file.CloseHandle(hProcess);
- win32file.CloseHandle(hThread);
- return exit_code
-
- env['SPAWN'] = my_spawn
- except:
- print "install win32all from http://sourceforge.net/project/showfiles.php?group_id=78018"
-
crossbuild = B.arguments.get('BF_CROSS', None)
if crossbuild and platform!='win32':
platform = 'linuxcross'
@@ -278,162 +234,6 @@
if not B.root_build_dir[-1]==os.sep:
B.root_build_dir += os.sep
-def NSIS_Installer():
-
- if env['OURPLATFORM'] != 'win32-vc' and env['OURPLATFORM'] != 'win32-mingw':
- print "NSIS installer is only available on Windows."
- Exit()
-
- install_base_dir = os.getcwd() + "\\"
-
- os.chdir("release")
- v = open("VERSION")
- version = v.read()[:-1]
- shortver = version.split('.')[0] + version.split('.')[1]
- v.close()
-
- #### change to suit install dir ####
- inst_dir = install_base_dir + env['BF_INSTALLDIR']
-
- os.chdir("windows/installer")
-
- ns = open("00.sconsblender.nsi","r")
-
- ns_cnt = str(ns.read())
- ns.close()
-
- # do root
- rootlist = []
- rootdir = os.listdir(inst_dir+"\\")
- for rootitem in rootdir:
- if os.path.isdir(inst_dir+"\\"+ rootitem) == 0:
- rootlist.append("File " + inst_dir + "\\" + rootitem)
- rootstring = string.join(rootlist, "\n ")
- rootstring += "\n\n"
- ns_cnt = string.replace(ns_cnt, "[ROOTDIRCONTS]", rootstring)
-
- # do delete items
- delrootlist = []
- for rootitem in rootdir:
- if os.path.isdir(inst_dir + rootitem) == 0:
- delrootlist.append("Delete $INSTDIR\\" + rootitem)
- delrootstring = string.join(delrootlist, "\n ")
- delrootstring += "\n"
- ns_cnt = string.replace(ns_cnt, "[DELROOTDIRCONTS]", delrootstring)
-
- # do scripts
- scriptlist = []
- scriptpath = "%s%s" % (inst_dir, "\\.blender\\scripts")
- scriptdir = os.listdir(scriptpath)
- for scriptitem in scriptdir:
- scriptfile = "%s\\%s" % (scriptpath, scriptitem)
- if os.path.isdir(scriptfile) == 0:
- scriptlist.append("File %s" % scriptfile)
- scriptstring = string.join(scriptlist, "\n ")
- scriptstring += "\n\n"
- ns_cnt = string.replace(ns_cnt, "[SCRIPTCONTS]", scriptstring)
-
- # do scripts\bpymodules
- bpymodlist = []
- bpymodpath = "%s%s" % (inst_dir, "\\.blender\\scripts\\bpymodules")
- bpymoddir = os.listdir(bpymodpath)
-
- for bpymoditem in bpymoddir:
- bpymodfile = "%s\\%s" % (bpymodpath, bpymoditem)
- if os.path.isdir(bpymodfile) == 0:
- bpymodlist.append("File %s" % bpymodfile)
- bpymodstring = string.join(bpymodlist, "\n ")
- bpymodstring += "\n\n"
- ns_cnt = string.replace(ns_cnt, "[SCRIPTMODCONTS]", bpymodstring)
-
- # do scripts\bpymodules\colladaimex
- colladalist = []
- bpymodpath = "%s%s" % (inst_dir, "\\.blender\\scripts\\bpymodules\\ColladaImEx")
- bpymoddir = os.listdir(bpymodpath)
-
- for bpymoditem in bpymoddir:
- bpymodfile = "%s\\%s" % (bpymodpath, bpymoditem)
- if os.path.isdir(bpymodfile) == 0:
- colladalist.append("File %s" % bpymodfile)
- bpymodstring = string.join(colladalist, "\n ")
- bpymodstring += "\n\n"
- ns_cnt = string.replace(ns_cnt, "[SCRIPTMODCOLLADACONT]", bpymodstring)
-
- # do scripts\bpydata
- bpydatalist = []
- bpydatapath = "%s%s" % (inst_dir, "\\.blender\\scripts\\bpydata")
- bpydatadir = os.listdir(bpydatapath)
- for bpydataitem in bpydatadir:
- bpydatafile = "%s\\%s" % (bpydatapath, bpydataitem)
- if os.path.isdir(bpydatafile) == 0:
- bpydatalist.append("File %s" % bpydatafile)
- bpydatastring = string.join(bpydatalist, "\n ")
- bpydatastring += "\n\n"
- ns_cnt = string.replace(ns_cnt, "[SCRIPTDATACONTS]", bpydatastring)
-
- # do plugins\include
- plugincludelist = []
- plugincludepath = "%s%s" % (inst_dir, "\\plugins\\include")
- plugincludedir = os.listdir(plugincludepath)
- for plugincludeitem in plugincludedir:
- plugincludefile = "%s\\%s" % (plugincludepath, plugincludeitem)
- if os.path.isdir(plugincludefile) == 0:
- if plugincludefile.find('.h') or plugincludefile.find('.DEF'):
- plugincludelist.append("File %s" % plugincludefile)
- plugincludestring = string.join(plugincludelist, "\n ")
- plugincludestring += "\n\n"
- ns_cnt = string.replace(ns_cnt, "[PLUGINCONTS]", plugincludestring)
-
- # do scripts\bpydata\config
- cfglist = []
- cfgpath = "%s%s" % (inst_dir, "\\.blender\\scripts\\bpydata\\config")
- cfgdir = os.listdir(cfgpath)
- for cfgitem in cfgdir:
- cfgfile = "%s\\%s" % (cfgpath, cfgitem)
- if os.path.isdir(cfgfile) == 0:
- cfglist.append("File %s" % cfgfile)
- cfgstring = string.join(cfglist, "\n ")
- cfgstring += "\n\n"
- ns_cnt = string.replace(ns_cnt, "[SCRIPTDATACFGCONTS]", cfgstring)
-
- # do dotblender
- dotblendlist = []
- dotblenddir = os.listdir(inst_dir+"\\.blender")
- for dotblenditem in dotblenddir:
- if os.path.isdir(inst_dir + "\\.blender\\" + dotblenditem) == 0:
- dotblendlist.append("File " + inst_dir + "\\.blender\\" + dotblenditem)
- dotblendstring = string.join(dotblendlist, "\n ")
- dotblendstring += "\n\n"
- ns_cnt = string.replace(ns_cnt, "[DOTBLENDERCONTS]", dotblendstring)
-
- # do language files
- langlist = []
- langfiles = []
- langdir = os.listdir(inst_dir + "\\.blender\\locale")
- for langitem in langdir:
- if os.path.isdir(inst_dir + "\\.blender\\locale\\" + langitem) == 1:
- langfiles.append("SetOutPath $BLENDERHOME\\.blender\\locale\\" + langitem + "\\LC_MESSAGES")
- langfiles.append("File " + inst_dir + "\\.blender\\locale\\" + langitem + "\\LC_MESSAGES\\blender.mo")
- langstring = string.join(langfiles, "\n ")
- langstring += "\n\n"
- ns_cnt = string.replace(ns_cnt, "[LANGUAGECONTS]", langstring)
-
- # var replacements
- ns_cnt = string.replace(ns_cnt, "DISTDIR", inst_dir+"\\")
- ns_cnt = string.replace(ns_cnt, "SHORTVER", shortver)
- ns_cnt = string.replace(ns_cnt, "VERSION", version)
-
- new_nsis = open("00.blender_tmp.nsi", 'w')
- new_nsis.write(ns_cnt)
- new_nsis.close()
-
- sys.stdout = os.popen("makensis 00.blender_tmp.nsi", 'w')
-
-nsis_build = None
-if 'nsis' in B.targets:
- NSIS_Installer()
- Exit()
-
# We do a shortcut for clean when no quicklist is given: just delete
# builddir without reading in SConscripts
do_clean = None
@@ -476,8 +276,6 @@
##### END SETUP ##########
Export('env')
-#Export('root_build_dir') # this one is still needed for makesdna
-##TODO: improve makesdna usage
BuildDir(B.root_build_dir+'/intern', 'intern', duplicate=0)
SConscript(B.root_build_dir+'/intern/SConscript')
@@ -591,8 +389,8 @@
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll',
'${LCGDIR}/png/lib/libpng.dll',
-# '#release/windows/extra/python24.zip',
-# '#release/windows/extra/zlib.pyd',
+ '#release/windows/extra/python25.zip',
+ '#release/windows/extra/zlib.pyd',
'${LCGDIR}/sdl/lib/SDL.dll',
'${LCGDIR}/zlib/lib/zlib.dll',
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list