[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36943] branches/soc-2010-jwilkins: Merge Cleanup.

[Jason Wilkins]

Revision: 36943
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36943
Author:   jwilkins
Date:     2011-05-27 07:24:38 +0000 (Fri, 27 May 2011)
Log Message:
-----------
Merge Cleanup.
First attempt to make sure branch is a copy of trunk revision 36905 except for files that have for sure been edited. There are a few minor edits to the changed files but nothing functional.  There will probably be a couple of more commits like this before I get a clean diff.

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

Modified Paths:
--------------
    branches/soc-2010-jwilkins/CMakeLists.txt
    branches/soc-2010-jwilkins/SConstruct
    branches/soc-2010-jwilkins/build_files/cmake/RpmBuild.cmake
    branches/soc-2010-jwilkins/build_files/cmake/cmake_consistency_check.py
    branches/soc-2010-jwilkins/build_files/cmake/cmake_qtcreator_project.py
    branches/soc-2010-jwilkins/build_files/cmake/macros.cmake
    branches/soc-2010-jwilkins/build_files/cmake/packaging.cmake
    branches/soc-2010-jwilkins/build_files/scons/config/aix4-config.py
    branches/soc-2010-jwilkins/build_files/scons/config/darwin-config.py
    branches/soc-2010-jwilkins/build_files/scons/config/freebsd7-config.py
    branches/soc-2010-jwilkins/build_files/scons/config/freebsd8-config.py
    branches/soc-2010-jwilkins/build_files/scons/config/freebsd9-config.py
    branches/soc-2010-jwilkins/build_files/scons/config/irix6-config.py
    branches/soc-2010-jwilkins/build_files/scons/config/linux2-config.py
    branches/soc-2010-jwilkins/build_files/scons/config/linuxcross-config.py
    branches/soc-2010-jwilkins/build_files/scons/config/openbsd3-config.py
    branches/soc-2010-jwilkins/build_files/scons/config/sunos5-config.py
    branches/soc-2010-jwilkins/build_files/scons/config/win32-mingw-config.py
    branches/soc-2010-jwilkins/build_files/scons/config/win32-vc-config.py
    branches/soc-2010-jwilkins/build_files/scons/config/win64-vc-config.py
    branches/soc-2010-jwilkins/build_files/scons/tools/btools.py
    branches/soc-2010-jwilkins/doc/manpage/blender.1.py
    branches/soc-2010-jwilkins/doc/python_api/examples/bpy.data.py
    branches/soc-2010-jwilkins/doc/python_api/rst/bge.logic.rst
    branches/soc-2010-jwilkins/doc/python_api/sphinx_doc_gen.py
    branches/soc-2010-jwilkins/doc/python_api/sphinx_doc_gen.sh
    branches/soc-2010-jwilkins/extern/CMakeLists.txt
    branches/soc-2010-jwilkins/extern/bullet2/CMakeLists.txt
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/Dynamics/btActionInterface.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletSoftBody/btSoftBody.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
    branches/soc-2010-jwilkins/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
    branches/soc-2010-jwilkins/extern/bullet2/src/LinearMath/btHashMap.h
    branches/soc-2010-jwilkins/extern/bullet2/src/LinearMath/btIDebugDraw.h
    branches/soc-2010-jwilkins/extern/bullet2/src/LinearMath/btMatrix3x3.h
    branches/soc-2010-jwilkins/extern/bullet2/src/LinearMath/btQuaternion.h
    branches/soc-2010-jwilkins/extern/bullet2/src/LinearMath/btScalar.h
    branches/soc-2010-jwilkins/extern/bullet2/src/LinearMath/btTransform.h
    branches/soc-2010-jwilkins/extern/bullet2/src/LinearMath/btTransformUtil.h
    branches/soc-2010-jwilkins/extern/glew/include/GL/glew.h
    branches/soc-2010-jwilkins/extern/libopenjpeg/SConscript
    branches/soc-2010-jwilkins/extern/libopenjpeg/event.c
    branches/soc-2010-jwilkins/intern/audaspace/COPYING
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_DelayFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_DelayReader.cpp
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_DoubleReader.cpp
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_FaderReader.cpp
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_LimiterReader.cpp
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_LoopFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_LoopReader.cpp
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_PingPongFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_PitchFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_RectifyFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_ReverseFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_ReverseReader.cpp
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_SquareFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_SumFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/FX/AUD_VolumeFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/soc-2010-jwilkins/intern/audaspace/Python/AUD_PyAPI.cpp
    branches/soc-2010-jwilkins/intern/audaspace/SConscript
    branches/soc-2010-jwilkins/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/soc-2010-jwilkins/intern/audaspace/intern/AUD_BufferReader.cpp
    branches/soc-2010-jwilkins/intern/audaspace/intern/AUD_C-API.cpp
    branches/soc-2010-jwilkins/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/intern/AUD_ConverterFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/intern/AUD_DefaultMixer.cpp
    branches/soc-2010-jwilkins/intern/audaspace/intern/AUD_FileFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/intern/AUD_LinearResampleFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/intern/AUD_MixerFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/intern/AUD_PyInit.h
    branches/soc-2010-jwilkins/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/soc-2010-jwilkins/intern/audaspace/intern/AUD_SoftwareDevice.cpp
    branches/soc-2010-jwilkins/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
    branches/soc-2010-jwilkins/intern/audaspace/jack/AUD_JackDevice.cpp
    branches/soc-2010-jwilkins/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_BSPNode.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_BSPNode.h
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_BSPTree.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_BSPTree.h
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Edge.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Edge.h
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Face.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Face.h
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Face2Face.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Face2Face.h
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Indexs.h
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Interface.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_MathUtils.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_MathUtils.h
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Merge.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Merge.h
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Merge2.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Merge2.h
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Mesh.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Mesh.h
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Misc.h
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Segment.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Segment.h
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Splitter.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Splitter.h
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Tag.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Tag.h
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Triangulator.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Triangulator.h
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Vertex.cpp
    branches/soc-2010-jwilkins/intern/boolop/intern/BOP_Vertex.h
    branches/soc-2010-jwilkins/intern/container/CTR_Map.h
    branches/soc-2010-jwilkins/intern/elbeem/intern/solver_init.cpp
    branches/soc-2010-jwilkins/intern/elbeem/intern/utilities.h
    branches/soc-2010-jwilkins/intern/ghost/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/ghost/GHOST_C-api.h
    branches/soc-2010-jwilkins/intern/ghost/GHOST_ISystem.h
    branches/soc-2010-jwilkins/intern/ghost/GHOST_Types.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_Debug.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_DropTargetWin32.cpp
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_EventNDOF.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_NDOFManager.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_System.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2010-jwilkins/intern/ghost/test/gears/GHOST_C-Test.c
    branches/soc-2010-jwilkins/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2010-jwilkins/intern/guardedalloc/intern/mallocn.c
    branches/soc-2010-jwilkins/intern/guardedalloc/intern/mmap_win.c
    branches/soc-2010-jwilkins/intern/guardedalloc/mmap_win.h
    branches/soc-2010-jwilkins/intern/guardedalloc/test/simpletest/memtest.c
    branches/soc-2010-jwilkins/intern/iksolver/intern/IK_Solver.cpp
    branches/soc-2010-jwilkins/intern/mikktspace/mikktspace.c
    branches/soc-2010-jwilkins/intern/moto/include/MT_assert.h
    branches/soc-2010-jwilkins/intern/opennl/superlu/smemory.c
    branches/soc-2010-jwilkins/intern/opennl/superlu/ssp_defs.h
    branches/soc-2010-jwilkins/intern/smoke/CMakeLists.txt
    branches/soc-2010-jwilkins/intern/tools/bpy_introspect_ui.py
    branches/soc-2010-jwilkins/intern/tools/dump_rna2xml.py
    branches/soc-2010-jwilkins/intern/tools/pydna.py
    branches/soc-2010-jwilkins/release/plugins/sequence/blur.c
    branches/soc-2010-jwilkins/release/plugins/sequence/color-correction-hsv.c
    branches/soc-2010-jwilkins/release/plugins/sequence/color-correction-yuv.c
    branches/soc-2010-jwilkins/release/plugins/sequence/dnr.c
    branches/soc-2010-jwilkins/release/plugins/sequence/gamma.c
    branches/soc-2010-jwilkins/release/plugins/sequence/scatter.c
    branches/soc-2010-jwilkins/release/scripts/modules/animsys_refactor.py
    branches/soc-2010-jwilkins/release/scripts/modules/blend_render_info.py
    branches/soc-2010-jwilkins/release/scripts/modules/bpy/ops.py
    branches/soc-2010-jwilkins/release/scripts/modules/bpy/path.py
    branches/soc-2010-jwilkins/release/scripts/modules/bpy/utils.py
    branches/soc-2010-jwilkins/release/scripts/modules/bpy_types.py
    branches/soc-2010-jwilkins/release/scripts/modules/bpyml.py
    branches/soc-2010-jwilkins/release/scripts/modules/bpyml_ui.py
    branches/soc-2010-jwilkins/release/scripts/modules/console/__init__.py
    branches/soc-2010-jwilkins/release/scripts/modules/console/complete_calltip.py
    branches/soc-2010-jwilkins/release/scripts/modules/console/complete_import.py
    branches/soc-2010-jwilkins/release/scripts/modules/console/complete_namespace.py
    branches/soc-2010-jwilkins/release/scripts/modules/console/intellisense.py
    branches/soc-2010-jwilkins/release/scripts/modules/rna_info.py
    branches/soc-2010-jwilkins/release/scripts/modules/rna_prop_ui.py
    branches/soc-2010-jwilkins/release/scripts/presets/ffmpeg/DVD.py
    branches/soc-2010-jwilkins/release/scripts/presets/ffmpeg/SVCD.py
    branches/soc-2010-jwilkins/release/scripts/presets/ffmpeg/VCD.py
    branches/soc-2010-jwilkins/release/scripts/presets/ffmpeg/h264.py
    branches/soc-2010-jwilkins/release/scripts/presets/ffmpeg/theora.py
    branches/soc-2010-jwilkins/release/scripts/presets/ffmpeg/xvid.py
    branches/soc-2010-jwilkins/release/scripts/presets/render/HDV_1080p.py
    branches/soc-2010-jwilkins/release/scripts/presets/sss/apple.py
    branches/soc-2010-jwilkins/release/scripts/templates/addon_add_object.py
    branches/soc-2010-jwilkins/release/scripts/templates/background_job.py
    branches/soc-2010-jwilkins/release/scripts/templates/builtin_keyingset.py
    branches/soc-2010-jwilkins/release/scripts/templates/operator_export.py
    branches/soc-2010-jwilkins/release/scripts/templates/operator_modal_draw.py
    branches/soc-2010-jwilkins/release/text/copyright.txt
    branches/soc-2010-jwilkins/release/windows/contrib/vfapi/vfapi-plugin.c
    branches/soc-2010-jwilkins/source/blender/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/avi/intern/avi.c
    branches/soc-2010-jwilkins/source/blender/avi/intern/avirgb.c
    branches/soc-2010-jwilkins/source/blender/avi/intern/codecs.c
    branches/soc-2010-jwilkins/source/blender/avi/intern/endian.c
    branches/soc-2010-jwilkins/source/blender/avi/intern/mjpeg.c
    branches/soc-2010-jwilkins/source/blender/avi/intern/options.c
    branches/soc-2010-jwilkins/source/blender/avi/intern/rgb32.c
    branches/soc-2010-jwilkins/source/blender/blenfont/BLF_api.h
    branches/soc-2010-jwilkins/source/blender/blenfont/SConscript
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf.c
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf_dir.c
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf_font.c
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf_internal.h
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf_internal_types.h
    branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_action.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_animsys.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_armature.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_cdderivedmesh.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_cloth.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_collision.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_curve.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_depsgraph.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_global.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_idprop.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_library.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_multires.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_object.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_packedFile.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_sca.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_scene.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_smoke.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_text.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_unit.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/blenkernel/SConscript
    branches/soc-2010-jwilkins/source/blender/blenkernel/depsgraph_private.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/BME_tools.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/action.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/armature.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/blender.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/boids.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/bvhutils.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/cloth.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/collision.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/constraint.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/context.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/curve.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/customdata.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/customdata_file.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/deform.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/displist.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/effect.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/fluidsim.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/font.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/gpencil.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/group.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/idcode.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/idprop.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/image_gen.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/implicit.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/ipo.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/key.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/lattice.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/library.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/mball.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/mesh.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/modifier.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/multires.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/nla.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/node.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/property.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/report.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sca.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/scene.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/script.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/seqcache.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/shrinkwrap.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/smoke.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/softbody.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sound.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/text.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/texture.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/unit.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/world.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/writeavi.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/writeframeserver.c
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_blenlib.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_bpath.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_cpu.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_fileops.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_kdopbvh.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_base.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_color.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_path_util.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_rand.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_storage.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_storage_types.h
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_winstuff.h
    branches/soc-2010-jwilkins/source/blender/blenlib/PIL_time.h
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_kdtree.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_mempool.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/boxpack2d.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/bpath.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/cpu.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/dynlib.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/fileops.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/freetypefont.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/listbase.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_base.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_color.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_geom.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/noise.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/path_util.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/pbvh.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/storage.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/string.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/threads.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/uvproject.c
    branches/soc-2010-jwilkins/source/blender/blenlib/intern/winstuff.c
    branches/soc-2010-jwilkins/source/blender/blenloader/BLO_readfile.h
    branches/soc-2010-jwilkins/source/blender/blenloader/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/blenloader/SConscript
    branches/soc-2010-jwilkins/source/blender/blenloader/intern/readblenentry.c
    branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-jwilkins/source/blender/blenloader/intern/writefile.c
    branches/soc-2010-jwilkins/source/blender/blenpluginapi/SConscript
    branches/soc-2010-jwilkins/source/blender/blenpluginapi/iff.h
    branches/soc-2010-jwilkins/source/blender/blenpluginapi/intern/pluginapi.c
    branches/soc-2010-jwilkins/source/blender/collada/AnimationImporter.cpp
    branches/soc-2010-jwilkins/source/blender/collada/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/collada/CameraExporter.cpp
    branches/soc-2010-jwilkins/source/blender/collada/DocumentExporter.cpp
    branches/soc-2010-jwilkins/source/blender/collada/DocumentImporter.cpp
    branches/soc-2010-jwilkins/source/blender/collada/DocumentImporter.h
    branches/soc-2010-jwilkins/source/blender/collada/EffectExporter.cpp
    branches/soc-2010-jwilkins/source/blender/collada/ImageExporter.cpp
    branches/soc-2010-jwilkins/source/blender/collada/MaterialExporter.cpp
    branches/soc-2010-jwilkins/source/blender/collada/MeshImporter.cpp
    branches/soc-2010-jwilkins/source/blender/collada/MeshImporter.h
    branches/soc-2010-jwilkins/source/blender/collada/SkinInfo.cpp
    branches/soc-2010-jwilkins/source/blender/collada/collada_internal.h
    branches/soc-2010-jwilkins/source/blender/collada/collada_utils.cpp
    branches/soc-2010-jwilkins/source/blender/editors/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2010-jwilkins/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/animation/anim_deps.c
    branches/soc-2010-jwilkins/source/blender/editors/animation/anim_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/animation/anim_filter.c
    branches/soc-2010-jwilkins/source/blender/editors/animation/anim_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/animation/anim_markers.c
    branches/soc-2010-jwilkins/source/blender/editors/animation/anim_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/animation/drivers.c
    branches/soc-2010-jwilkins/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2010-jwilkins/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/animation/keyframes_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/animation/keyframes_general.c
    branches/soc-2010-jwilkins/source/blender/editors/animation/keyframing.c
    branches/soc-2010-jwilkins/source/blender/editors/animation/keyingsets.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/BIF_generate.h
    branches/soc-2010-jwilkins/source/blender/editors/armature/armature_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/armature/armature_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/editarmature.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/editarmature_generate.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/editarmature_retarget.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/poseSlide.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/poseUtils.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/poselib.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/poseobject.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/reeb.c
    branches/soc-2010-jwilkins/source/blender/editors/armature/reeb.h
    branches/soc-2010-jwilkins/source/blender/editors/curve/editcurve.c
    branches/soc-2010-jwilkins/source/blender/editors/curve/editfont.c
    branches/soc-2010-jwilkins/source/blender/editors/curve/lorem.c
    branches/soc-2010-jwilkins/source/blender/editors/datafiles/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/datafiles/startup.blend.c
    branches/soc-2010-jwilkins/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2010-jwilkins/source/blender/editors/gpencil/editaction_gpencil.c
    branches/soc-2010-jwilkins/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_anim_api.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_armature.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_image.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_keyframes_draw.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_keyframing.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_mesh.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_object.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_screen.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_screen_types.h
    branches/soc-2010-jwilkins/source/blender/editors/include/ED_view3d.h
    branches/soc-2010-jwilkins/source/blender/editors/include/UI_icons.h
    branches/soc-2010-jwilkins/source/blender/editors/include/UI_interface.h
    branches/soc-2010-jwilkins/source/blender/editors/include/UI_resources.h
    branches/soc-2010-jwilkins/source/blender/editors/interface/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_handlers.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_icons.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_layout.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_panel.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_regions.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_style.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_templates.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_utils.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_widgets.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/resources.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/view2d.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/view2d_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/editface.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_lib.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_loop.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/loopcut.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_data.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/mesh/meshtools.c
    branches/soc-2010-jwilkins/source/blender/editors/metaball/mball_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/object/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/object/object_add.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_bake.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_constraint.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_group.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_hook.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_lattice.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_modifier.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_relations.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_select.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_shapekey.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_transform.c
    branches/soc-2010-jwilkins/source/blender/editors/object/object_vgroup.c
    branches/soc-2010-jwilkins/source/blender/editors/physics/particle_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/physics/particle_object.c
    branches/soc-2010-jwilkins/source/blender/editors/physics/physics_fluid.c
    branches/soc-2010-jwilkins/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_internal.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_opengl.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_preview.c
    branches/soc-2010-jwilkins/source/blender/editors/render/render_shading.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/screen/area.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/screen_context.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/screen_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/screen_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/screen/screendump.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_undo.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2010-jwilkins/source/blender/editors/sound/sound_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_action/action_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_action/action_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_action/action_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_action/action_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_action/action_select.c
    branches/soc-2010-jwilkins/source/blender/editors/space_action/space_action.c
    branches/soc-2010-jwilkins/source/blender/editors/space_api/spacetypes.c
    branches/soc-2010-jwilkins/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2010-jwilkins/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_console/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/space_console/console_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_console/console_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_console/console_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_console/space_console.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/space_file/file_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/file_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_file/file_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/file_panels.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/filelist.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/filesel.c
    branches/soc-2010-jwilkins/source/blender/editors/space_file/space_file.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_select.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_utils.c
    branches/soc-2010-jwilkins/source/blender/editors/space_graph/space_graph.c
    branches/soc-2010-jwilkins/source/blender/editors/space_image/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/space_image/image_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_image/image_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_image/image_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_image/space_image.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/editors/space_info/info_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_info/info_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/info_stats.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/space_info.c
    branches/soc-2010-jwilkins/source/blender/editors/space_logic/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_window.c
    branches/soc-2010-jwilkins/source/blender/editors/space_logic/space_logic.c
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_channels.c
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_select.c
    branches/soc-2010-jwilkins/source/blender/editors/space_nla/space_nla.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/space_node/drawnode.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_header.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_select.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/node_state.c
    branches/soc-2010-jwilkins/source/blender/editors/space_node/space_node.c
    branches/soc-2010-jwilkins/source/blender/editors/space_outliner/outliner.c
    branches/soc-2010-jwilkins/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2010-jwilkins/source/blender/editors/space_script/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/space_script/script_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_script/script_header.c
    branches/soc-2010-jwilkins/source/blender/editors/space_script/space_script.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_scopes.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sound/sound_header.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sound/space_sound.c
    branches/soc-2010-jwilkins/source/blender/editors/space_text/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/space_text/space_text.c
    branches/soc-2010-jwilkins/source/blender/editors/space_text/text_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_text/text_header.c
    branches/soc-2010-jwilkins/source/blender/editors/space_text/text_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_text/text_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_text/text_python.c
    branches/soc-2010-jwilkins/source/blender/editors/space_time/space_time.c
    branches/soc-2010-jwilkins/source/blender/editors/space_time/time_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_userpref/space_userpref.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/SConscript
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawanimviz.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform.h
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform_constraints.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform_conversions.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform_generics.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform_ndofinput.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform_orientations.c
    branches/soc-2010-jwilkins/source/blender/editors/transform/transform_snap.c
    branches/soc-2010-jwilkins/source/blender/editors/util/crazyspace.c
    branches/soc-2010-jwilkins/source/blender/editors/util/ed_util.c
    branches/soc-2010-jwilkins/source/blender/editors/util/editmode_undo.c
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_material.c
    branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/soc-2010-jwilkins/source/blender/ikplugin/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2010-jwilkins/source/blender/imbuf/IMB_imbuf_types.h
    branches/soc-2010-jwilkins/source/blender/imbuf/SConscript
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/IMB_anim.h
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/allocimbuf.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/bmp.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/cache.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/cineon/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/cineon/cineon_dpx.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/cineon/cineonlib.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/cineon/dpxlib.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/dds/ColorBlock.cpp
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/dds/DirectDrawSurface.h
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/dds/SConscript
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/dds/dds_api.cpp
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/divers.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/filetype.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/filter.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/imbuf_cocoa.m
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/iris.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/jp2.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/jpeg.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/openexr/SConscript
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/openexr/openexr_api.h
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/openexr/openexr_multi.h
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/png.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/radiance_hdr.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/scaling.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/targa.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/thumbs.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/thumbs_blend.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/tiff.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/util.c
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_ID.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_action_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_armature_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_documentation.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_image_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_ipo_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_lattice_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_node_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_object_fluidsim.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_object_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_screen_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_space_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_vfont_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2010-jwilkins/source/blender/makesdna/intern/SConscript
    branches/soc-2010-jwilkins/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2010-jwilkins/source/blender/makesdna/intern/makesdna.c
    branches/soc-2010-jwilkins/source/blender/makesrna/RNA_access.h
    branches/soc-2010-jwilkins/source/blender/makesrna/RNA_define.h
    branches/soc-2010-jwilkins/source/blender/makesrna/RNA_types.h
    branches/soc-2010-jwilkins/source/blender/makesrna/SConscript
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/SConscript
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/makesrna.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_access.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_action.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_action_api.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_armature_api.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_camera.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_cloth.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_color.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_context.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_define.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_gpencil.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_image.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_image_api.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_key.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_lattice.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_main.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_material.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_meta.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_object.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_render.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_smoke.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_space.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_text.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_world.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_armature.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_bevel.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_boolean.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_build.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_cast.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_cloth.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_collision.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_curve.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_decimate.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_fluidsim.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_fluidsim_util.h
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_hook.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_lattice.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_mask.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_mirror.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_multires.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_particlesystem.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_shapekey.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_shrinkwrap.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_smoke.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_smooth.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_subsurf.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_uvproject.c
    branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2010-jwilkins/source/blender/nodes/SConscript
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_brightness.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_dilate.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_directionalblur.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_flip.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_image.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_math.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_normal.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_premulkey.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_sepcombRGBA.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYUVA.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_setalpha.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_translate.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_value.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_util.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_material.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_math.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_output.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_value.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_at.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_image.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_math.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_output.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
    branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_util.c
    branches/soc-2010-jwilkins/source/blender/python/BPY_extern.h
    branches/soc-2010-jwilkins/source/blender/python/SConscript
    branches/soc-2010-jwilkins/source/blender/python/generic/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/python/generic/IDProp.c
    branches/soc-2010-jwilkins/source/blender/python/generic/IDProp.h
    branches/soc-2010-jwilkins/source/blender/python/generic/bgl.c
    branches/soc-2010-jwilkins/source/blender/python/generic/bgl.h
    branches/soc-2010-jwilkins/source/blender/python/generic/blf_py_api.c
    branches/soc-2010-jwilkins/source/blender/python/generic/blf_py_api.h
    branches/soc-2010-jwilkins/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2010-jwilkins/source/blender/python/generic/bpy_internal_import.h
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils.h
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Color.h
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Euler.h
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Matrix.h
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Quaternion.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Quaternion.h
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Vector.h
    branches/soc-2010-jwilkins/source/blender/python/generic/noise_py_api.c
    branches/soc-2010-jwilkins/source/blender/python/generic/noise_py_api.h
    branches/soc-2010-jwilkins/source/blender/python/generic/py_capi_utils.c
    branches/soc-2010-jwilkins/source/blender/python/generic/py_capi_utils.h
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy.h
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_app.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_driver.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_interface.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_operator.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_props.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna.h
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna_array.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna_callback.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_util.c
    branches/soc-2010-jwilkins/source/blender/python/rna_dump.py
    branches/soc-2010-jwilkins/source/blender/quicktime/SConscript
    branches/soc-2010-jwilkins/source/blender/quicktime/apple/qtkit_export.m
    branches/soc-2010-jwilkins/source/blender/quicktime/apple/qtkit_import.m
    branches/soc-2010-jwilkins/source/blender/quicktime/apple/quicktime_export.c
    branches/soc-2010-jwilkins/source/blender/quicktime/apple/quicktime_import.c
    branches/soc-2010-jwilkins/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2010-jwilkins/source/blender/render/extern/include/RE_shader_ext.h
    branches/soc-2010-jwilkins/source/blender/render/intern/include/raycounter.h
    branches/soc-2010-jwilkins/source/blender/render/intern/include/rayobject.h
    branches/soc-2010-jwilkins/source/blender/render/intern/include/render_types.h
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/bvh.h
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject.cpp
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/reorganize.h
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/svbvh.h
    branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/vbvh.h
    branches/soc-2010-jwilkins/source/blender/render/intern/source/convertblender.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/envmap.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/imagetexture.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/occlusion.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/pipeline.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/pixelblending.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/pixelshading.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/pointdensity.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/rayshade.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/render_texture.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/rendercore.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/renderdatabase.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/shadbuf.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/shadeinput.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/sss.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/strand.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/sunsky.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/volume_precache.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/volumetric.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/voxeldata.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/zbuf.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blender/windowmanager/SConscript
    branches/soc-2010-jwilkins/source/blender/windowmanager/WM_api.h
    branches/soc-2010-jwilkins/source/blender/windowmanager/WM_types.h
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_cursors.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_gesture.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/wm_event_system.h
    branches/soc-2010-jwilkins/source/blender/windowmanager/wm_event_types.h
    branches/soc-2010-jwilkins/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/soc-2010-jwilkins/source/blenderplayer/bad_level_call_stubs/SConscript
    branches/soc-2010-jwilkins/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2010-jwilkins/source/creator/CMakeLists.txt
    branches/soc-2010-jwilkins/source/creator/SConscript
    branches/soc-2010-jwilkins/source/creator/buildinfo.c
    branches/soc-2010-jwilkins/source/creator/creator.c
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/SConscript
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ActionActuator.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ArmatureActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ArmatureActuator.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ArmatureChannel.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ArmatureConstraint.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ArmatureConstraint.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ArmatureObject.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/BlenderWorldInfo.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/BlenderWorldInfo.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/soc-2010-jwilkins/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/KX_ConvertProperties.cpp
    branches/soc-2010-jwilkins/source/gameengine/Converter/SConscript
    branches/soc-2010-jwilkins/source/gameengine/Expressions/BoolValue.cpp
    branches/soc-2010-jwilkins/source/gameengine/Expressions/BoolValue.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/FloatValue.cpp
    branches/soc-2010-jwilkins/source/gameengine/Expressions/FloatValue.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/IntValue.cpp
    branches/soc-2010-jwilkins/source/gameengine/Expressions/IntValue.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/KX_Python.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/ListValue.cpp
    branches/soc-2010-jwilkins/source/gameengine/Expressions/ListValue.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2010-jwilkins/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/SConscript
    branches/soc-2010-jwilkins/source/gameengine/Expressions/StringValue.h
    branches/soc-2010-jwilkins/source/gameengine/Expressions/Value.cpp
    branches/soc-2010-jwilkins/source/gameengine/Expressions/Value.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_ANDController.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_ActuatorSensor.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_IController.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_IController.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_IInputDevice.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_IObject.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_IObject.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_ISensor.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_JoystickSensor.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_LogicManager.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_MouseSensor.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_NANDController.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_NORController.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_ORController.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PropertySensor.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PythonController.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PythonKeyboard.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PythonMouse.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PythonMouse.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_RandomActuator.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_RandomSensor.h
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_XNORController.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_XORController.cpp
    branches/soc-2010-jwilkins/source/gameengine/GameLogic/SConscript
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/common/SConscript
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/ghost/SConscript
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/xembed/UnixShell.c
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/xembed/npunix.c
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/BL_Shader.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/BL_Shader.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/BL_Texture.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ArmatureSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ArmatureSensor.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Camera.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_CameraActuator.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ConstraintWrapper.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_GameActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Light.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Light.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_MeshProxy.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_MouseFocusSensor.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_NearSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_NearSensor.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ObjectActuator.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PolyProxy.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PyConstraintBinding.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PyMath.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PyMath.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PythonInit.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PythonInitTypes.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PythonSeq.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_RaySensor.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_SceneActuator.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_StateActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_VehicleWrapper.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_VertexProxy.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_WorldIpoController.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/SConscript
    branches/soc-2010-jwilkins/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2010-jwilkins/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2010-jwilkins/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2010-jwilkins/source/gameengine/Physics/Bullet/SConscript
    branches/soc-2010-jwilkins/source/gameengine/Physics/common/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2010-jwilkins/source/gameengine/Rasterizer/SConscript
    branches/soc-2010-jwilkins/source/gameengine/SceneGraph/SG_BBox.h
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/CMakeLists.txt
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/ImageBase.cpp
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/ImageBuff.cpp
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/SConscript
    branches/soc-2010-jwilkins/source/gameengine/VideoTexture/VideoBase.cpp

Added Paths:
-----------
    branches/soc-2010-jwilkins/release/scripts/modules/sys_info.py
    branches/soc-2010-jwilkins/release/scripts/presets/render/HDV_NTSC_1080p.py
    branches/soc-2010-jwilkins/release/scripts/presets/render/HDV_PAL_1080p.py
    branches/soc-2010-jwilkins/source/blender/editors/space_info/info_draw.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/info_report.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/textview.c
    branches/soc-2010-jwilkins/source/blender/editors/space_info/textview.h
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Color.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Euler.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Matrix.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_Vector.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_geometry.c
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_geometry.h

Removed Paths:
-------------
    branches/soc-2010-jwilkins/extern/bullet2/make/
    branches/soc-2010-jwilkins/extern/glew/make/
    branches/soc-2010-jwilkins/extern/lzma/make/
    branches/soc-2010-jwilkins/extern/lzo/make/
    branches/soc-2010-jwilkins/intern/boolop/make/
    branches/soc-2010-jwilkins/intern/bsp/make/
    branches/soc-2010-jwilkins/intern/container/make/
    branches/soc-2010-jwilkins/intern/decimation/make/
    branches/soc-2010-jwilkins/intern/decimation/test/decimate_glut_test/make/
    branches/soc-2010-jwilkins/intern/elbeem/make/
    branches/soc-2010-jwilkins/intern/ghost/make/
    branches/soc-2010-jwilkins/intern/ghost/test/make/
    branches/soc-2010-jwilkins/intern/guardedalloc/make/
    branches/soc-2010-jwilkins/intern/iksolver/make/
    branches/soc-2010-jwilkins/intern/iksolver/test/ik_glut_test/make/
    branches/soc-2010-jwilkins/intern/itasc/make/
    branches/soc-2010-jwilkins/intern/make/
    branches/soc-2010-jwilkins/intern/memutil/make/
    branches/soc-2010-jwilkins/intern/moto/make/
    branches/soc-2010-jwilkins/intern/opennl/make/
    branches/soc-2010-jwilkins/intern/smoke/make/
    branches/soc-2010-jwilkins/intern/string/make/
    branches/soc-2010-jwilkins/projectfiles/
    branches/soc-2010-jwilkins/projectfiles_vc7/
    branches/soc-2010-jwilkins/projectfiles_vc9/
    branches/soc-2010-jwilkins/release/scripts/modules/rigify/
    branches/soc-2010-jwilkins/release/windows/BlenderPlayer/
    branches/soc-2010-jwilkins/release/windows/extra/
    branches/soc-2010-jwilkins/release/windows/specific.sh
    branches/soc-2010-jwilkins/source/blender/blenlib/BLI_bfile.h
    branches/soc-2010-jwilkins/source/blender/python/generic/geometry.c
    branches/soc-2010-jwilkins/source/blender/python/generic/geometry.h
    branches/soc-2010-jwilkins/source/blender/verify/
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/ActiveX/
    branches/soc-2010-jwilkins/source/gameengine/GamePlayer/netscape/
    branches/soc-2010-jwilkins/source/tools/cygwin/
    branches/soc-2010-jwilkins/source/tools/hmake/
    branches/soc-2010-jwilkins/source/tools/wrap.pl

Modified: branches/soc-2010-jwilkins/CMakeLists.txt
===================================================================
--- branches/soc-2010-jwilkins/CMakeLists.txt	2011-05-27 03:45:52 UTC (rev 36942)
+++ branches/soc-2010-jwilkins/CMakeLists.txt	2011-05-27 07:24:38 UTC (rev 36943)
@@ -44,8 +44,8 @@
 			"\n "
 			"\n Alternately define WITH_IN_SOURCE_BUILD to force this option (not recommended!)"
 		)
+	endif()
 endif()
-endif()
 
 cmake_minimum_required(VERSION 2.8)
 
@@ -83,7 +83,7 @@
 get_blender_version()
 
 # Blender internal features
-option(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
+option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
 
 option(WITH_PYTHON        "Enable Embedded Python API  (only disable for development)" ON)
 option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
@@ -138,7 +138,7 @@
 
 # 3D format support
 # disable opencollada on non-apple unix because opencollada has no package for debian
-	option(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org)"	OFF)
+option(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org)"	OFF)
 
 # Sound output
 option(WITH_SDL           "Enable SDL for sound and joystick support" ON)
@@ -156,7 +156,7 @@
 	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
 endif()
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
-OPTION(WITH_ONSURFACEBRUSH   "Enable use of the 'on-surface brush' for paint/sculpt.  Requires a stencil buffer, GL_depth_texture, and GLSL" ON)
+option(WITH_ONSURFACEBRUSH       "Enable use of the 'on-surface brush' for paint/sculpt.  Requires a stencil buffer, GL_depth_texture, and GLSL" ON)
 
 # disable for now, but plan to support on all platforms eventually
 option(WITH_MEM_JEMALLOC   "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
@@ -245,7 +245,7 @@
 #Platform specifics
 
 if(UNIX AND NOT APPLE)
-
+	
 	# needed for ubuntu 11.04
 	if(EXISTS "/usr/lib/x86_64-linux-gnu")
 		set(CMAKE_LIBRARY_PATH "/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
@@ -299,7 +299,7 @@
 	if(WITH_PYTHON)
 		# No way to set py32. remove for now.
 		# find_package(PythonLibs)
-	
+
 		# defines...
 		
 		#  PYTHON_VERSION
@@ -338,9 +338,9 @@
 			/opt/include/OpenEXR
 		)
 		mark_as_advanced(OPENEXR_INC)
-		
-		set(OPENEXR_LIB Half IlmImf Iex Imath)
 
+		set(OPENEXR_LIB Half IlmImf Iex Imath)
+		
 		if(NOT OPENEXR_INC)
 			set(WITH_IMAGE_OPENEXR OFF)
 		endif()
@@ -423,15 +423,15 @@
 
 	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		if(NOT WITH_PYTHON_MODULE)
-		# BSD's dont use libdl.so
-		list(APPEND LLIBS -ldl)
+			# BSD's dont use libdl.so
+			list(APPEND LLIBS -ldl)
 
-		# binreloc is linux only
-		set(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
-		set(BINRELOC_INC ${BINRELOC}/include)
+			# binreloc is linux only
+			set(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
+			set(BINRELOC_INC ${BINRELOC}/include)
 			set(WITH_BINRELOC ON)
+		endif()
 	endif()
-	endif()
 
 	set(PLATFORM_LINKFLAGS "-pthread")
 
@@ -441,11 +441,9 @@
 	# GNU Compiler
 	if(CMAKE_COMPILER_IS_GNUCC)
 		set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
-
-	IF(WITH_ONSURFACEBRUSH)
-		ADD_DEFINITIONS(-DWITH_ONSURFACEBRUSH)
-	ENDIF(WITH_ONSURFACEBRUSH)
-
+		if(WITH_ONSURFACEBRUSH)
+			add_defintion(-DWITH_ONSURFACEBRUSH)
+		endif(WITH_ONSURFACEBRUSH)
 	# Intel C++ Compiler
 	elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 		# think these next two are broken
@@ -473,7 +471,7 @@
 
 	# this file is included anyway when building under Windows with cl.exe
 	#  include(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
-  
+
 	set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
 
 	# Setup 64bit and 64bit windows systems
@@ -540,9 +538,9 @@
 		add_definitions(-D__SSE__ -D__MMX__)
 	endif()
 
-	IF(WITH_ONSURFACEBRUSH)
-		ADD_DEFINITIONS(-DWITH_ONSURFACEBRUSH)
-	ENDIF(WITH_ONSURFACEBRUSH)
+	if(WITH_ONSURFACEBRUSH)
+		add_defintion(-DWITH_ONSURFACEBRUSH)
+	endif(WITH_ONSURFACEBRUSH)
 
 	if(MSVC)
 		if(CMAKE_CL_64)
@@ -570,7 +568,7 @@
 		set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
 		set(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
 		set(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
-		
+
 		if(WITH_INTERNATIONAL)
 			set(GETTEXT ${LIBDIR}/gettext)
 			set(GETTEXT_INC ${GETTEXT}/include)
@@ -581,7 +579,7 @@
 				set(GETTEXT_LIB gnu_gettext)
 			endif()
 		endif()
-		
+
 		if(CMAKE_CL_64)
 			set(PNG_LIBRARIES libpng)
 		else()
@@ -602,12 +600,12 @@
 		set(PTHREADS_INC ${PTHREADS}/include)
 		set(PTHREADS_LIBPATH ${PTHREADS}/lib)
 		set(PTHREADS_LIB pthreadVC2)
-
+		
 		set(FREETYPE ${LIBDIR}/freetype)
 		set(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
 		set(FREETYPE_LIBPATH ${FREETYPE}/lib)
 		set(FREETYPE_LIBRARY freetype2ST)
-		
+
 		if(WITH_FFTW3)
 			set(FFTW3 ${LIBDIR}/fftw3)
 			set(FFTW3_LIB libfftw)
@@ -622,14 +620,14 @@
 			set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa UTF)
 			set(PCRE_LIB pcre)
 		endif()
-
+	
 		if(WITH_CODEC_FFMPEG)
 			set(FFMPEG ${LIBDIR}/ffmpeg)
 			set(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
 			set(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
 			set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		endif()
-        
+
 		if(WITH_IMAGE_OPENEXR)
 			if(MSVC80)
 				set(MSVC_LIB _vs2005)
@@ -649,7 +647,7 @@
 			set(OPENEXR_LIBPATH ${OPENEXR}/lib${MSVC_LIB})
 			set(OPENEXR_INCUDE ${OPENEXR}/include${MSVC_INC})
 			set(OPENEXR_INC ${OPENEXR_INCUDE}/ ${OPENEXR_INCUDE}/IlmImf ${OPENEXR_INCUDE}/Iex ${OPENEXR_INCUDE}/Imath)
-			endif()
+		endif()
 
 		if(WITH_IMAGE_TIFF)
 			set(TIFF ${LIBDIR}/tiff)
@@ -680,7 +678,7 @@
 		else()
 			set(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib /STACK:2097152 ")
 		endif()
-	  
+
 		set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
 
 	else()
@@ -717,12 +715,12 @@
 		set(PTHREADS_INC ${PTHREADS}/include)
 		set(PTHREADS_LIBPATH ${PTHREADS}/lib)
 		set(PTHREADS_LIB pthreadGC2)
-
+		
 		set(FREETYPE ${LIBDIR}/gcc/freetype)
 		set(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
 		set(FREETYPE_LIBPATH ${FREETYPE}/lib)
 		set(FREETYPE_LIBRARY freetype)
-		
+
 		if(WITH_FFTW3)
 			set(FFTW3 ${LIBDIR}/gcc/fftw3)
 			set(FFTW3_LIB fftw3)
@@ -737,14 +735,14 @@
 			set(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
 			set(PCRE_LIB pcre)
 		endif()
-
+		
 		if(WITH_CODEC_FFMPEG)
 			set(FFMPEG ${LIBDIR}/ffmpeg)
 			set(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include)
 			set(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
 			set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		endif()
-		
+
 		if(WITH_IMAGE_OPENEXR)
 			set(OPENEXR ${LIBDIR}/gcc/openexr)
 			set(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
@@ -858,7 +856,7 @@
 		set(GETTEXT_LIB intl iconv)
 		set(GETTEXT_LIBPATH ${GETTEXT}/lib)
 	endif()
-  
+
 	if(WITH_FFTW3)
 		set(FFTW3 ${LIBDIR}/fftw3)
 		set(FFTW3_INC ${FFTW3}/include)
@@ -957,10 +955,6 @@
 		set(TIFF_LIBPATH ${TIFF}/lib)
 	endif()
 
-	IF(WITH_ONSURFACEBRUSH)
-		ADD_DEFINITIONS(-DWITH_ONSURFACEBRUSH)
-	ENDIF(WITH_ONSURFACEBRUSH)
-
 	set(EXETYPE MACOSX_BUNDLE)
 
 	set(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
@@ -983,9 +977,9 @@
 if(APPLE OR WIN32)
 	if(NOT IS_DIRECTORY "${LIBDIR}")
 		message(FATAL_ERROR "Apple and Windows require pre-compiled libs at: '${LIBDIR}'")
-		endif()
 	endif()
-	
+endif()
+
 if(WITH_RAYOPTIMIZATION)
 	if(CMAKE_COMPILER_IS_GNUCC)
 		if(SUPPORT_SSE_BUILD)
@@ -1009,10 +1003,10 @@
 		set(OPENJPEG_LIB openjpeg)
 		set(OPENJPEG_LIBPATH ${OPENJPEG}/lib)
 	else()
-	set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
-	set(OPENJPEG_INC ${OPENJPEG})
+		set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
+		set(OPENJPEG_INC ${OPENJPEG})
+	endif()
 endif()
-endif()
 
 if(WITH_IMAGE_REDCODE)
 	set(REDCODE ${CMAKE_SOURCE_DIR}/extern)

Modified: branches/soc-2010-jwilkins/SConstruct
===================================================================
--- branches/soc-2010-jwilkins/SConstruct	2011-05-27 03:45:52 UTC (rev 36942)
+++ branches/soc-2010-jwilkins/SConstruct	2011-05-27 07:24:38 UTC (rev 36943)
@@ -35,9 +35,9 @@
 
 # Need a better way to do this. Automagical maybe is not the best thing, maybe it is.
 if pltfrm.architecture()[0] == '64bit':
-	bitness = 64
+    bitness = 64
 else:
-	bitness = 32
+    bitness = 32
 
 import sys
 import os
@@ -85,15 +85,15 @@
 # XX cheating for BF_FANCY, we check for BF_FANCY before args are validated
 use_color = ARGUMENTS.get('BF_FANCY', '1')
 if platform=='win32':
-	use_color = None
+    use_color = None
 
 if not use_color=='1':
-	B.bc.disable()
-	
+    B.bc.disable()
+    
  #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
@@ -116,81 +116,81 @@
 quickdebug = B.arguments.get('BF_QUICKDEBUG', None)
 
 if quickdebug:
-	B.quickdebug=string.split(quickdebug, ',')
+    B.quickdebug=string.split(quickdebug, ',')
 else:
-	B.quickdebug=[]
+    B.quickdebug=[]
 
 if quickie:
-	B.quickie=string.split(quickie,',')
+    B.quickie=string.split(quickie,',')
 else:
-	B.quickie=[]
-	
+    B.quickie=[]
+    
 toolset = B.arguments.get('BF_TOOLSET', None)
 if toolset:
-	print "Using " + toolset
-	if toolset=='mstoolkit':
-		env = BlenderEnvironment(ENV = os.environ)
-		env.Tool('mstoolkit', [toolpath])
-	else:
-		env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
-		# xxx commented out, as was supressing warnings under mingw..
-		#if env:
-		#	btools.SetupSpawn(env)
+    print "Using " + toolset
+    if toolset=='mstoolkit':
+        env = BlenderEnvironment(ENV = os.environ)
+        env.Tool('mstoolkit', [toolpath])
+    else:
+        env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
+        # xxx commented out, as was supressing warnings under mingw..

@@ Diff output truncated at 10240 characters. @@