[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55364] branches/ge_harmony: Merged revisions 54858-55361 from trunk/blender

[Daniel Stokes]

Revision: 55364
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55364
Author:   kupoman
Date:     2013-03-17 22:29:48 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Merged revisions 54858-55361 from trunk/blender

This one was a little messy. Could be some issues left.

Modified Paths:
--------------
    branches/ge_harmony/CMakeLists.txt
    branches/ge_harmony/SConstruct
    branches/ge_harmony/build_files/buildbot/slave_compile.py
    branches/ge_harmony/build_files/buildbot/slave_pack.py
    branches/ge_harmony/build_files/cmake/clang_array_check.py
    branches/ge_harmony/build_files/cmake/macros.cmake
    branches/ge_harmony/build_files/scons/tools/Blender.py
    branches/ge_harmony/doc/build_systems/cmake.txt
    branches/ge_harmony/doc/python_api/rst/bge.logic.rst
    branches/ge_harmony/extern/CMakeLists.txt
    branches/ge_harmony/extern/SConscript
    branches/ge_harmony/extern/bullet2/CMakeLists.txt
    branches/ge_harmony/extern/bullet2/readme.txt
    branches/ge_harmony/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/Gimpact/btCompoundFromGimpact.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/Gimpact/gim_array.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/Gimpact/gim_box_collision.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.cpp
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btSoftBody.h
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btSoftBodyData.h
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btSoftBodySolvers.h
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
    branches/ge_harmony/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
    branches/ge_harmony/extern/bullet2/src/LinearMath/btAabbUtil2.h
    branches/ge_harmony/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
    branches/ge_harmony/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
    branches/ge_harmony/extern/bullet2/src/LinearMath/btConvexHull.cpp
    branches/ge_harmony/extern/bullet2/src/LinearMath/btConvexHullComputer.cpp
    branches/ge_harmony/extern/bullet2/src/LinearMath/btDefaultMotionState.h
    branches/ge_harmony/extern/bullet2/src/LinearMath/btGrahamScan2dConvexHull.h
    branches/ge_harmony/extern/bullet2/src/LinearMath/btIDebugDraw.h
    branches/ge_harmony/extern/bullet2/src/LinearMath/btMatrix3x3.h
    branches/ge_harmony/extern/bullet2/src/LinearMath/btQuadWord.h
    branches/ge_harmony/extern/bullet2/src/LinearMath/btQuaternion.h
    branches/ge_harmony/extern/bullet2/src/LinearMath/btScalar.h
    branches/ge_harmony/extern/bullet2/src/LinearMath/btSerializer.cpp
    branches/ge_harmony/extern/bullet2/src/LinearMath/btSerializer.h
    branches/ge_harmony/extern/bullet2/src/LinearMath/btTransform.h
    branches/ge_harmony/extern/bullet2/src/LinearMath/btVector3.h
    branches/ge_harmony/extern/bullet2/src/SConscript
    branches/ge_harmony/extern/bullet2/src/btBulletCollisionCommon.h
    branches/ge_harmony/extern/bullet2/src/btBulletDynamicsCommon.h
    branches/ge_harmony/extern/libmv/CMakeLists.txt
    branches/ge_harmony/extern/libmv/ChangeLog
    branches/ge_harmony/extern/libmv/SConscript
    branches/ge_harmony/extern/libmv/bundle.sh
    branches/ge_harmony/extern/libmv/files.txt
    branches/ge_harmony/extern/libmv/libmv/multiview/euclidean_resection.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/bundle.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/bundle.h
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/intersect.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/modal_solver.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/track_region.cc
    branches/ge_harmony/extern/libmv/libmv-capi.cpp
    branches/ge_harmony/extern/libmv/libmv-capi.h
    branches/ge_harmony/extern/libmv/patches/series
    branches/ge_harmony/extern/libmv/third_party/ceres/CMakeLists.txt
    branches/ge_harmony/extern/libmv/third_party/ceres/ChangeLog
    branches/ge_harmony/extern/libmv/third_party/ceres/SConscript
    branches/ge_harmony/extern/libmv/third_party/ceres/bundle.sh
    branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/dynamic_autodiff_cost_function.h
    branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/internal/eigen.h
    branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/problem.h
    branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/solver.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/cxsparse.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/evaluator.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/evaluator.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generate_eliminator_specialization.py
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/mutex.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/preconditioner.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/residual_block.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/solver.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/visibility.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h
    branches/ge_harmony/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
    branches/ge_harmony/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h
    branches/ge_harmony/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_Sequencer.h
    branches/ge_harmony/intern/cycles/blender/addon/properties.py
    branches/ge_harmony/intern/cycles/blender/addon/ui.py
    branches/ge_harmony/intern/cycles/blender/blender_camera.cpp
    branches/ge_harmony/intern/cycles/blender/blender_curves.cpp
    branches/ge_harmony/intern/cycles/blender/blender_object.cpp
    branches/ge_harmony/intern/cycles/blender/blender_session.cpp
    branches/ge_harmony/intern/cycles/blender/blender_session.h
    branches/ge_harmony/intern/cycles/blender/blender_sync.h
    branches/ge_harmony/intern/cycles/device/device_cuda.cpp
    branches/ge_harmony/intern/cycles/kernel/shaders/node_math.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_texture.h
    branches/ge_harmony/intern/cycles/kernel/shaders/node_vector_math.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_wave_texture.osl
    branches/ge_harmony/intern/cycles/render/object.cpp
    branches/ge_harmony/intern/elbeem/intern/ntl_geometrymodel.cpp
    branches/ge_harmony/intern/elbeem/intern/ntl_geometryobject.cpp
    branches/ge_harmony/intern/elbeem/intern/ntl_geometryobject.h
    branches/ge_harmony/intern/elbeem/intern/ntl_ray.cpp
    branches/ge_harmony/intern/elbeem/intern/ntl_ray.h
    branches/ge_harmony/intern/elbeem/intern/solver_main.cpp
    branches/ge_harmony/intern/elbeem/intern/solver_util.cpp
    branches/ge_harmony/intern/ffmpeg/ffmpeg_compat.h
    branches/ge_harmony/intern/ghost/GHOST_ISystem.h
    branches/ge_harmony/intern/ghost/intern/GHOST_Event.h
    branches/ge_harmony/intern/ghost/intern/GHOST_EventManager.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_EventManager.h
    branches/ge_harmony/intern/ghost/intern/GHOST_Path-api.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_System.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_System.h
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemSDL.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemSDL.h
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_TimerManager.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_TimerTask.h
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowSDL.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowSDL.h
    branches/ge_harmony/intern/iksolver/intern/IK_Solver.cpp
    branches/ge_harmony/intern/itasc/Armature.cpp
    branches/ge_harmony/intern/itasc/Armature.hpp
    branches/ge_harmony/intern/itasc/kdl/segment.cpp
    branches/ge_harmony/intern/locale/boost_locale_wrapper.cpp
    branches/ge_harmony/intern/locale/boost_locale_wrapper.h
    branches/ge_harmony/intern/memutil/MEM_Allocator.h
    branches/ge_harmony/intern/memutil/MEM_CacheLimiter.h
    branches/ge_harmony/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/ge_harmony/intern/opencolorio/ocio_impl.h
    branches/ge_harmony/intern/rigidbody/rb_bullet_api.cpp
    branches/ge_harmony/intern/smoke/intern/FLUID_3D.h
    branches/ge_harmony/intern/smoke/intern/FLUID_3D_STATIC.cpp
    branches/ge_harmony/intern/smoke/intern/WTURBULENCE.h
    branches/ge_harmony/intern/string/intern/STR_String.cpp
    branches/ge_harmony/intern/utfconv/utf_winfunc.c
    branches/ge_harmony/intern/utfconv/utf_winfunc.h
    branches/ge_harmony/release/datafiles/startup.blend
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/settings.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/utils.py
    branches/ge_harmony/release/scripts/modules/bpy_extras/keyconfig_utils.py
    branches/ge_harmony/release/scripts/modules/console/complete_import.py
    branches/ge_harmony/release/scripts/presets/operator/wm.collada_export/second_life_rigged.py
    branches/ge_harmony/release/scripts/presets/operator/wm.collada_export/second_life_static.py
    branches/ge_harmony/release/scripts/startup/bl_operators/object.py
    branches/ge_harmony/release/scripts/startup/bl_operators/wm.py
    branches/ge_harmony/release/scripts/startup/bl_ui/__init__.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_paint_common.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_scene.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_texture.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_clip.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_image.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_nla.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_node.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_sequencer.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_userpref.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/ge_harmony/release/scripts/startup/keyingsets_builtins.py
    branches/ge_harmony/release/windows/contrib/vfapi/vfapi-plugin.c
    branches/ge_harmony/source/blender/avi/intern/avi.c
    branches/ge_harmony/source/blender/blenfont/BLF_api.h
    branches/ge_harmony/source/blender/blenfont/BLF_translation.h
    branches/ge_harmony/source/blender/blenfont/intern/blf.c
    branches/ge_harmony/source/blender/blenfont/intern/blf_dir.c
    branches/ge_harmony/source/blender/blenfont/intern/blf_font.c
    branches/ge_harmony/source/blender/blenfont/intern/blf_internal.h
    branches/ge_harmony/source/blender/blenfont/intern/blf_lang.c
    branches/ge_harmony/source/blender/blenfont/intern/blf_translation.c
    branches/ge_harmony/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_animsys.h
    branches/ge_harmony/source/blender/blenkernel/BKE_blender.h
    branches/ge_harmony/source/blender/blenkernel/BKE_brush.h
    branches/ge_harmony/source/blender/blenkernel/BKE_ccg.h
    branches/ge_harmony/source/blender/blenkernel/BKE_curve.h
    branches/ge_harmony/source/blender/blenkernel/BKE_depsgraph.h
    branches/ge_harmony/source/blender/blenkernel/BKE_fcurve.h
    branches/ge_harmony/source/blender/blenkernel/BKE_font.h
    branches/ge_harmony/source/blender/blenkernel/BKE_idcode.h
    branches/ge_harmony/source/blender/blenkernel/BKE_image.h
    branches/ge_harmony/source/blender/blenkernel/BKE_library.h
    branches/ge_harmony/source/blender/blenkernel/BKE_main.h
    branches/ge_harmony/source/blender/blenkernel/BKE_mball.h
    branches/ge_harmony/source/blender/blenkernel/BKE_mesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_movieclip.h
    branches/ge_harmony/source/blender/blenkernel/BKE_node.h
    branches/ge_harmony/source/blender/blenkernel/BKE_object.h
    branches/ge_harmony/source/blender/blenkernel/BKE_packedFile.h
    branches/ge_harmony/source/blender/blenkernel/BKE_paint.h
    branches/ge_harmony/source/blender/blenkernel/BKE_pbvh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_report.h
    branches/ge_harmony/source/blender/blenkernel/BKE_rigidbody.h
    branches/ge_harmony/source/blender/blenkernel/BKE_screen.h
    branches/ge_harmony/source/blender/blenkernel/BKE_sequencer.h
    branches/ge_harmony/source/blender/blenkernel/BKE_text.h
    branches/ge_harmony/source/blender/blenkernel/BKE_tracking.h
    branches/ge_harmony/source/blender/blenkernel/BKE_unit.h
    branches/ge_harmony/source/blender/blenkernel/depsgraph_private.h
    branches/ge_harmony/source/blender/blenkernel/intern/DerivedMesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/anim.c
    branches/ge_harmony/source/blender/blenkernel/intern/anim_sys.c
    branches/ge_harmony/source/blender/blenkernel/intern/armature.c
    branches/ge_harmony/source/blender/blenkernel/intern/blender.c
    branches/ge_harmony/source/blender/blenkernel/intern/bmfont.c
    branches/ge_harmony/source/blender/blenkernel/intern/brush.c
    branches/ge_harmony/source/blender/blenkernel/intern/cloth.c
    branches/ge_harmony/source/blender/blenkernel/intern/collision.c
    branches/ge_harmony/source/blender/blenkernel/intern/colortools.c
    branches/ge_harmony/source/blender/blenkernel/intern/constraint.c
    branches/ge_harmony/source/blender/blenkernel/intern/context.c
    branches/ge_harmony/source/blender/blenkernel/intern/curve.c
    branches/ge_harmony/source/blender/blenkernel/intern/customdata.c
    branches/ge_harmony/source/blender/blenkernel/intern/customdata_file.c
    branches/ge_harmony/source/blender/blenkernel/intern/deform.c
    branches/ge_harmony/source/blender/blenkernel/intern/depsgraph.c
    branches/ge_harmony/source/blender/blenkernel/intern/dynamicpaint.c
    branches/ge_harmony/source/blender/blenkernel/intern/fcurve.c
    branches/ge_harmony/source/blender/blenkernel/intern/fmodifier.c
    branches/ge_harmony/source/blender/blenkernel/intern/font.c
    branches/ge_harmony/source/blender/blenkernel/intern/idcode.c
    branches/ge_harmony/source/blender/blenkernel/intern/idprop.c
    branches/ge_harmony/source/blender/blenkernel/intern/image.c
    branches/ge_harmony/source/blender/blenkernel/intern/image_gen.c
    branches/ge_harmony/source/blender/blenkernel/intern/implicit.c
    branches/ge_harmony/source/blender/blenkernel/intern/key.c
    branches/ge_harmony/source/blender/blenkernel/intern/lattice.c
    branches/ge_harmony/source/blender/blenkernel/intern/library.c
    branches/ge_harmony/source/blender/blenkernel/intern/mask.c
    branches/ge_harmony/source/blender/blenkernel/intern/material.c
    branches/ge_harmony/source/blender/blenkernel/intern/mball.c
    branches/ge_harmony/source/blender/blenkernel/intern/mesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/mesh_validate.c
    branches/ge_harmony/source/blender/blenkernel/intern/modifier.c
    branches/ge_harmony/source/blender/blenkernel/intern/movieclip.c
    branches/ge_harmony/source/blender/blenkernel/intern/navmesh_conversion.c
    branches/ge_harmony/source/blender/blenkernel/intern/nla.c
    branches/ge_harmony/source/blender/blenkernel/intern/node.c
    branches/ge_harmony/source/blender/blenkernel/intern/object.c
    branches/ge_harmony/source/blender/blenkernel/intern/packedFile.c
    branches/ge_harmony/source/blender/blenkernel/intern/paint.c
    branches/ge_harmony/source/blender/blenkernel/intern/pbvh.c
    branches/ge_harmony/source/blender/blenkernel/intern/pbvh_bmesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/pointcache.c
    branches/ge_harmony/source/blender/blenkernel/intern/property.c
    branches/ge_harmony/source/blender/blenkernel/intern/rigidbody.c
    branches/ge_harmony/source/blender/blenkernel/intern/scene.c
    branches/ge_harmony/source/blender/blenkernel/intern/seqcache.c
    branches/ge_harmony/source/blender/blenkernel/intern/seqeffects.c
    branches/ge_harmony/source/blender/blenkernel/intern/seqmodifier.c
    branches/ge_harmony/source/blender/blenkernel/intern/sequencer.c
    branches/ge_harmony/source/blender/blenkernel/intern/smoke.c
    branches/ge_harmony/source/blender/blenkernel/intern/softbody.c
    branches/ge_harmony/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/ge_harmony/source/blender/blenkernel/intern/text.c
    branches/ge_harmony/source/blender/blenkernel/intern/texture.c
    branches/ge_harmony/source/blender/blenkernel/intern/tracking.c
    branches/ge_harmony/source/blender/blenkernel/intern/unit.c
    branches/ge_harmony/source/blender/blenkernel/intern/writeffmpeg.c
    branches/ge_harmony/source/blender/blenlib/BLI_buffer.h
    branches/ge_harmony/source/blender/blenlib/BLI_fileops.h
    branches/ge_harmony/source/blender/blenlib/BLI_fileops_types.h
    branches/ge_harmony/source/blender/blenlib/BLI_ghash.h
    branches/ge_harmony/source/blender/blenlib/BLI_gsqueue.h
    branches/ge_harmony/source/blender/blenlib/BLI_heap.h
    branches/ge_harmony/source/blender/blenlib/BLI_lasso.h
    branches/ge_harmony/source/blender/blenlib/BLI_linklist.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_base.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_geom.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_inline.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_vector.h
    branches/ge_harmony/source/blender/blenlib/BLI_path_util.h
    branches/ge_harmony/source/blender/blenlib/BLI_rect.h
    branches/ge_harmony/source/blender/blenlib/BLI_string.h
    branches/ge_harmony/source/blender/blenlib/BLI_string_utf8.h
    branches/ge_harmony/source/blender/blenlib/BLI_utildefines.h
    branches/ge_harmony/source/blender/blenlib/BLI_winstuff.h
    branches/ge_harmony/source/blender/blenlib/CMakeLists.txt
    branches/ge_harmony/source/blender/blenlib/SConscript
    branches/ge_harmony/source/blender/blenlib/intern/BLI_ghash.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_heap.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_linklist.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_memarena.c
    branches/ge_harmony/source/blender/blenlib/intern/buffer.c
    branches/ge_harmony/source/blender/blenlib/intern/fileops.c
    branches/ge_harmony/source/blender/blenlib/intern/freetypefont.c
    branches/ge_harmony/source/blender/blenlib/intern/gsqueue.c
    branches/ge_harmony/source/blender/blenlib/intern/lasso.c
    branches/ge_harmony/source/blender/blenlib/intern/math_base.c
    branches/ge_harmony/source/blender/blenlib/intern/math_geom.c
    branches/ge_harmony/source/blender/blenlib/intern/math_matrix.c
    branches/ge_harmony/source/blender/blenlib/intern/math_vector_inline.c
    branches/ge_harmony/source/blender/blenlib/intern/noise.c
    branches/ge_harmony/source/blender/blenlib/intern/path_util.c
    branches/ge_harmony/source/blender/blenlib/intern/rct.c
    branches/ge_harmony/source/blender/blenlib/intern/storage.c
    branches/ge_harmony/source/blender/blenlib/intern/string.c
    branches/ge_harmony/source/blender/blenlib/intern/string_utf8.c
    branches/ge_harmony/source/blender/blenlib/intern/threads.c
    branches/ge_harmony/source/blender/blenlib/intern/winstuff.c
    branches/ge_harmony/source/blender/blenloader/BLO_readfile.h
    branches/ge_harmony/source/blender/blenloader/intern/readblenentry.c
    branches/ge_harmony/source/blender/blenloader/intern/readfile.c
    branches/ge_harmony/source/blender/blenloader/intern/readfile.h
    branches/ge_harmony/source/blender/blenloader/intern/versioning_250.c
    branches/ge_harmony/source/blender/blenloader/intern/versioning_legacy.c
    branches/ge_harmony/source/blender/blenloader/intern/writefile.c
    branches/ge_harmony/source/blender/bmesh/CMakeLists.txt
    branches/ge_harmony/source/blender/bmesh/SConscript
    branches/ge_harmony/source/blender/bmesh/bmesh_class.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_core.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_core.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_interp.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators_inline.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_log.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mods.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mods.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operator_api_inline.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operators.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_polygon.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_polygon.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_queries.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_queries.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_structure.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_bevel.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_connect.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_create.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_dissolve.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_extrude.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_hull.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_smooth_laplacian.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_subdivide.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_wireframe.c
    branches/ge_harmony/source/blender/bmesh/tools/bmesh_bevel.c
    branches/ge_harmony/source/blender/bmesh/tools/bmesh_bevel.h
    branches/ge_harmony/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
    branches/ge_harmony/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
    branches/ge_harmony/source/blender/bmesh/tools/bmesh_edgesplit.c
    branches/ge_harmony/source/blender/collada/AnimationExporter.cpp
    branches/ge_harmony/source/blender/collada/AnimationExporter.h
    branches/ge_harmony/source/blender/collada/ArmatureImporter.cpp
    branches/ge_harmony/source/blender/collada/ArmatureImporter.h
    branches/ge_harmony/source/blender/collada/CMakeLists.txt
    branches/ge_harmony/source/blender/collada/ControllerExporter.cpp
    branches/ge_harmony/source/blender/collada/DocumentExporter.cpp
    branches/ge_harmony/source/blender/collada/DocumentImporter.cpp
    branches/ge_harmony/source/blender/collada/EffectExporter.cpp
    branches/ge_harmony/source/blender/collada/ExportSettings.h
    branches/ge_harmony/source/blender/collada/ExtraHandler.cpp
    branches/ge_harmony/source/blender/collada/GeometryExporter.cpp
    branches/ge_harmony/source/blender/collada/GeometryExporter.h
    branches/ge_harmony/source/blender/collada/MaterialExporter.h
    branches/ge_harmony/source/blender/collada/MeshImporter.cpp
    branches/ge_harmony/source/blender/collada/MeshImporter.h
    branches/ge_harmony/source/blender/collada/SConscript
    branches/ge_harmony/source/blender/collada/SceneExporter.cpp
    branches/ge_harmony/source/blender/collada/SceneExporter.h
    branches/ge_harmony/source/blender/collada/TransformReader.cpp
    branches/ge_harmony/source/blender/collada/TransformWriter.cpp
    branches/ge_harmony/source/blender/collada/TransformWriter.h
    branches/ge_harmony/source/blender/collada/collada.cpp
    branches/ge_harmony/source/blender/collada/collada.h
    branches/ge_harmony/source/blender/collada/collada_internal.cpp
    branches/ge_harmony/source/blender/collada/collada_internal.h
    branches/ge_harmony/source/blender/collada/collada_utils.cpp
    branches/ge_harmony/source/blender/collada/collada_utils.h
    branches/ge_harmony/source/blender/compositor/COM_compositor.h
    branches/ge_harmony/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/ge_harmony/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_CompositorNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_MixNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ViewerNode.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MixBaseOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MixBaseOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_PreviewOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_TextureOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_TextureOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_TranslateOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_TranslateOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_ViewerBaseOperation.h
    branches/ge_harmony/source/blender/editors/animation/anim_channels_defines.c
    branches/ge_harmony/source/blender/editors/animation/anim_channels_edit.c
    branches/ge_harmony/source/blender/editors/animation/anim_filter.c
    branches/ge_harmony/source/blender/editors/animation/anim_ipo_utils.c
    branches/ge_harmony/source/blender/editors/animation/anim_markers.c
    branches/ge_harmony/source/blender/editors/animation/anim_ops.c
    branches/ge_harmony/source/blender/editors/animation/fmodifier_ui.c
    branches/ge_harmony/source/blender/editors/animation/keyframing.c
    branches/ge_harmony/source/blender/editors/animation/keyingsets.c
    branches/ge_harmony/source/blender/editors/armature/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/armature/armature_intern.h
    branches/ge_harmony/source/blender/editors/armature/armature_ops.c
    branches/ge_harmony/source/blender/editors/armature/editarmature_generate.c
    branches/ge_harmony/source/blender/editors/armature/editarmature_retarget.c
    branches/ge_harmony/source/blender/editors/armature/editarmature_sketch.c
    branches/ge_harmony/source/blender/editors/armature/meshlaplacian.c
    branches/ge_harmony/source/blender/editors/armature/reeb.c
    branches/ge_harmony/source/blender/editors/curve/editcurve.c
    branches/ge_harmony/source/blender/editors/curve/editfont.c
    branches/ge_harmony/source/blender/editors/datafiles/SConscript
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_buttons.c
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_paint.c
    branches/ge_harmony/source/blender/editors/include/BIF_glutil.h
    branches/ge_harmony/source/blender/editors/include/ED_anim_api.h
    branches/ge_harmony/source/blender/editors/include/ED_armature.h
    branches/ge_harmony/source/blender/editors/include/ED_curve.h
    branches/ge_harmony/source/blender/editors/include/ED_fileselect.h
    branches/ge_harmony/source/blender/editors/include/ED_mesh.h
    branches/ge_harmony/source/blender/editors/include/ED_numinput.h
    branches/ge_harmony/source/blender/editors/include/ED_screen.h
    branches/ge_harmony/source/blender/editors/include/ED_sequencer.h
    branches/ge_harmony/source/blender/editors/include/ED_space_api.h
    branches/ge_harmony/source/blender/editors/include/ED_transform.h
    branches/ge_harmony/source/blender/editors/include/ED_view3d.h
    branches/ge_harmony/source/blender/editors/include/UI_interface.h
    branches/ge_harmony/source/blender/editors/include/UI_resources.h
    branches/ge_harmony/source/blender/editors/interface/interface.c
    branches/ge_harmony/source/blender/editors/interface/interface_anim.c
    branches/ge_harmony/source/blender/editors/interface/interface_draw.c
    branches/ge_harmony/source/blender/editors/interface/interface_handlers.c
    branches/ge_harmony/source/blender/editors/interface/interface_icons.c
    branches/ge_harmony/source/blender/editors/interface/interface_intern.h
    branches/ge_harmony/source/blender/editors/interface/interface_layout.c
    branches/ge_harmony/source/blender/editors/interface/interface_ops.c
    branches/ge_harmony/source/blender/editors/interface/interface_panel.c
    branches/ge_harmony/source/blender/editors/interface/interface_regions.c
    branches/ge_harmony/source/blender/editors/interface/interface_style.c
    branches/ge_harmony/source/blender/editors/interface/interface_templates.c
    branches/ge_harmony/source/blender/editors/interface/interface_widgets.c
    branches/ge_harmony/source/blender/editors/interface/resources.c
    branches/ge_harmony/source/blender/editors/interface/view2d.c
    branches/ge_harmony/source/blender/editors/interface/view2d_ops.c
    branches/ge_harmony/source/blender/editors/io/io_collada.c
    branches/ge_harmony/source/blender/editors/mask/mask_add.c
    branches/ge_harmony/source/blender/editors/mask/mask_ops.c
    branches/ge_harmony/source/blender/editors/mask/mask_select.c
    branches/ge_harmony/source/blender/editors/mesh/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/mesh/editface.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_add.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_knife.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_loopcut.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_rip.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_select.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_tools.c
    branches/ge_harmony/source/blender/editors/mesh/mesh_data.c
    branches/ge_harmony/source/blender/editors/mesh/mesh_intern.h
    branches/ge_harmony/source/blender/editors/mesh/mesh_ops.c
    branches/ge_harmony/source/blender/editors/mesh/meshtools.c
    branches/ge_harmony/source/blender/editors/metaball/mball_edit.c
    branches/ge_harmony/source/blender/editors/metaball/mball_ops.c
    branches/ge_harmony/source/blender/editors/object/object_add.c
    branches/ge_harmony/source/blender/editors/object/object_bake.c
    branches/ge_harmony/source/blender/editors/object/object_constraint.c
    branches/ge_harmony/source/blender/editors/object/object_edit.c
    branches/ge_harmony/source/blender/editors/object/object_intern.h
    branches/ge_harmony/source/blender/editors/object/object_lattice.c
    branches/ge_harmony/source/blender/editors/object/object_modifier.c
    branches/ge_harmony/source/blender/editors/object/object_ops.c
    branches/ge_harmony/source/blender/editors/object/object_relations.c
    branches/ge_harmony/source/blender/editors/object/object_transform.c
    branches/ge_harmony/source/blender/editors/object/object_vgroup.c
    branches/ge_harmony/source/blender/editors/physics/particle_edit.c
    branches/ge_harmony/source/blender/editors/physics/physics_fluid.c
    branches/ge_harmony/source/blender/editors/physics/physics_ops.c
    branches/ge_harmony/source/blender/editors/physics/rigidbody_object.c
    branches/ge_harmony/source/blender/editors/physics/rigidbody_world.c
    branches/ge_harmony/source/blender/editors/render/SConscript
    branches/ge_harmony/source/blender/editors/render/render_internal.c
    branches/ge_harmony/source/blender/editors/render/render_opengl.c
    branches/ge_harmony/source/blender/editors/render/render_preview.c
    branches/ge_harmony/source/blender/editors/render/render_shading.c
    branches/ge_harmony/source/blender/editors/render/render_update.c
    branches/ge_harmony/source/blender/editors/render/render_view.c
    branches/ge_harmony/source/blender/editors/screen/area.c
    branches/ge_harmony/source/blender/editors/screen/glutil.c
    branches/ge_harmony/source/blender/editors/screen/screen_edit.c
    branches/ge_harmony/source/blender/editors/screen/screen_ops.c
    branches/ge_harmony/source/blender/editors/screen/screendump.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/sculpt_paint/SConscript
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_hide.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_image.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_image_2d.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_intern.h
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_mask.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_ops.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_utils.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/ge_harmony/source/blender/editors/sound/sound_ops.c
    branches/ge_harmony/source/blender/editors/space_action/action_edit.c
    branches/ge_harmony/source/blender/editors/space_action/action_select.c
    branches/ge_harmony/source/blender/editors/space_buttons/buttons_ops.c
    branches/ge_harmony/source/blender/editors/space_buttons/buttons_texture.c
    branches/ge_harmony/source/blender/editors/space_clip/SConscript
    branches/ge_harmony/source/blender/editors/space_clip/clip_dopesheet_ops.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_draw.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_graph_ops.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_intern.h
    branches/ge_harmony/source/blender/editors/space_clip/clip_ops.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_toolbar.c
    branches/ge_harmony/source/blender/editors/space_clip/space_clip.c
    branches/ge_harmony/source/blender/editors/space_clip/tracking_ops.c
    branches/ge_harmony/source/blender/editors/space_clip/tracking_select.c
    branches/ge_harmony/source/blender/editors/space_console/console_draw.c
    branches/ge_harmony/source/blender/editors/space_console/console_ops.c
    branches/ge_harmony/source/blender/editors/space_console/space_console.c
    branches/ge_harmony/source/blender/editors/space_file/file_draw.c
    branches/ge_harmony/source/blender/editors/space_file/file_ops.c
    branches/ge_harmony/source/blender/editors/space_file/filelist.c
    branches/ge_harmony/source/blender/editors/space_file/filelist.h
    branches/ge_harmony/source/blender/editors/space_file/filesel.c
    branches/ge_harmony/source/blender/editors/space_file/fsmenu.c
    branches/ge_harmony/source/blender/editors/space_file/fsmenu.h
    branches/ge_harmony/source/blender/editors/space_file/space_file.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_buttons.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_edit.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_ops.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_select.c
    branches/ge_harmony/source/blender/editors/space_image/SConscript
    branches/ge_harmony/source/blender/editors/space_image/image_buttons.c
    branches/ge_harmony/source/blender/editors/space_image/image_draw.c
    branches/ge_harmony/source/blender/editors/space_image/image_intern.h
    branches/ge_harmony/source/blender/editors/space_image/image_ops.c
    branches/ge_harmony/source/blender/editors/space_image/space_image.c
    branches/ge_harmony/source/blender/editors/space_info/info_ops.c
    branches/ge_harmony/source/blender/editors/space_info/info_report.c
    branches/ge_harmony/source/blender/editors/space_info/info_stats.c
    branches/ge_harmony/source/blender/editors/space_info/textview.c
    branches/ge_harmony/source/blender/editors/space_logic/logic_ops.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_buttons.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_channels.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_draw.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_edit.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_intern.h
    branches/ge_harmony/source/blender/editors/space_nla/nla_ops.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_select.c
    branches/ge_harmony/source/blender/editors/space_node/drawnode.c
    branches/ge_harmony/source/blender/editors/space_node/node_add.c
    branches/ge_harmony/source/blender/editors/space_node/node_draw.c
    branches/ge_harmony/source/blender/editors/space_node/node_edit.c
    branches/ge_harmony/source/blender/editors/space_node/node_group.c
    branches/ge_harmony/source/blender/editors/space_node/node_intern.h
    branches/ge_harmony/source/blender/editors/space_node/node_ops.c
    branches/ge_harmony/source/blender/editors/space_node/node_relationships.c
    branches/ge_harmony/source/blender/editors/space_node/node_select.c
    branches/ge_harmony/source/blender/editors/space_node/node_view.c
    branches/ge_harmony/source/blender/editors/space_node/space_node.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_draw.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_edit.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_intern.h
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_ops.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_select.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_tools.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_tree.c
    branches/ge_harmony/source/blender/editors/space_outliner/space_outliner.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_add.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_select.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_view.c
    branches/ge_harmony/source/blender/editors/space_sequencer/space_sequencer.c
    branches/ge_harmony/source/blender/editors/space_text/space_text.c
    branches/ge_harmony/source/blender/editors/space_text/text_autocomplete.c
    branches/ge_harmony/source/blender/editors/space_text/text_draw.c
    branches/ge_harmony/source/blender/editors/space_text/text_format.c
    branches/ge_harmony/source/blender/editors/space_text/text_format_lua.c
    branches/ge_harmony/source/blender/editors/space_text/text_format_osl.c
    branches/ge_harmony/source/blender/editors/space_text/text_format_py.c
    branches/ge_harmony/source/blender/editors/space_text/text_ops.c
    branches/ge_harmony/source/blender/editors/space_view3d/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/space_view3d/drawmesh.c
    branches/ge_harmony/source/blender/editors/space_view3d/drawobject.c
    branches/ge_harmony/source/blender/editors/space_view3d/space_view3d.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_draw.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_edit.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_fly.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_header.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_intern.h
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_ops.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_project.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_select.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_view.c
    branches/ge_harmony/source/blender/editors/transform/transform.c
    branches/ge_harmony/source/blender/editors/transform/transform.h
    branches/ge_harmony/source/blender/editors/transform/transform_constraints.c
    branches/ge_harmony/source/blender/editors/transform/transform_conversions.c
    branches/ge_harmony/source/blender/editors/transform/transform_generics.c
    branches/ge_harmony/source/blender/editors/transform/transform_input.c
    branches/ge_harmony/source/blender/editors/transform/transform_manipulator.c
    branches/ge_harmony/source/blender/editors/transform/transform_ops.c
    branches/ge_harmony/source/blender/editors/transform/transform_orientations.c
    branches/ge_harmony/source/blender/editors/transform/transform_snap.c
    branches/ge_harmony/source/blender/editors/util/ed_util.c
    branches/ge_harmony/source/blender/editors/util/editmode_undo.c
    branches/ge_harmony/source/blender/editors/util/numinput.c
    branches/ge_harmony/source/blender/editors/util/undo.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_draw.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_ops.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/ge_harmony/source/blender/gpu/CMakeLists.txt
    branches/ge_harmony/source/blender/gpu/GPU_extensions.h
    branches/ge_harmony/source/blender/gpu/SConscript
    branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.c
    branches/ge_harmony/source/blender/gpu/intern/gpu_draw.c
    branches/ge_harmony/source/blender/gpu/intern/gpu_extensions.c
    branches/ge_harmony/source/blender/gpu/intern/gpu_material.c
    branches/ge_harmony/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/ge_harmony/source/blender/gpu/shaders/gpu_shader_vertex.glsl
    branches/ge_harmony/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/ge_harmony/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/ge_harmony/source/blender/imbuf/IMB_imbuf.h
    branches/ge_harmony/source/blender/imbuf/SConscript
    branches/ge_harmony/source/blender/imbuf/intern/IMB_colormanagement_intern.h
    branches/ge_harmony/source/blender/imbuf/intern/IMB_indexer.h
    branches/ge_harmony/source/blender/imbuf/intern/anim_movie.c
    branches/ge_harmony/source/blender/imbuf/intern/bmp.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/cineon_dpx.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/cineonlib.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/dpxlib.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/logImageCore.c
    branches/ge_harmony/source/blender/imbuf/intern/colormanagement.c
    branches/ge_harmony/source/blender/imbuf/intern/dds/BlockDXT.cpp
    branches/ge_harmony/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/ge_harmony/source/blender/imbuf/intern/dds/FlipDXT.cpp
    branches/ge_harmony/source/blender/imbuf/intern/filetype.c
    branches/ge_harmony/source/blender/imbuf/intern/imageprocess.c
    branches/ge_harmony/source/blender/imbuf/intern/indexer.c
    branches/ge_harmony/source/blender/imbuf/intern/iris.c
    branches/ge_harmony/source/blender/imbuf/intern/jpeg.c
    branches/ge_harmony/source/blender/imbuf/intern/moviecache.c
    branches/ge_harmony/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/ge_harmony/source/blender/imbuf/intern/png.c
    branches/ge_harmony/source/blender/imbuf/intern/radiance_hdr.c
    branches/ge_harmony/source/blender/imbuf/intern/readimage.c
    branches/ge_harmony/source/blender/imbuf/intern/rectop.c
    branches/ge_harmony/source/blender/imbuf/intern/scaling.c
    branches/ge_harmony/source/blender/imbuf/intern/targa.c
    branches/ge_harmony/source/blender/imbuf/intern/thumbs.c
    branches/ge_harmony/source/blender/imbuf/intern/util.c
    branches/ge_harmony/source/blender/makesdna/DNA_action_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_actuator_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_anim_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_brush_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_controller_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_customdata_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_defs.h
    branches/ge_harmony/source/blender/makesdna/DNA_genfile.h
    branches/ge_harmony/source/blender/makesdna/DNA_group_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_image_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_key_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_mask_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_modifier_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_node_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_property_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_rigidbody_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_scene_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_sensor_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_sequence_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_space_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_text_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_texture_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_tracking_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_userdef_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_vfont_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_view3d_types.h
    branches/ge_harmony/source/blender/makesdna/intern/dna_genfile.c
    branches/ge_harmony/source/blender/makesdna/intern/makesdna.c
    branches/ge_harmony/source/blender/makesrna/RNA_access.h
    branches/ge_harmony/source/blender/makesrna/RNA_types.h
    branches/ge_harmony/source/blender/makesrna/intern/CMakeLists.txt
    branches/ge_harmony/source/blender/makesrna/intern/makesrna.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_ID.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_access.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_action.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_actuator.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_animation.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_animviz.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_armature.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_boid.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_brush.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_camera.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_cloth.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_color.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_constraint.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_context.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_controller.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_curve.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_fcurve.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_fluidsim.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_gpencil.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_group.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_image.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_image_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_internal.h
    branches/ge_harmony/source/blender/makesrna/intern/rna_internal_types.h
    branches/ge_harmony/source/blender/makesrna/intern/rna_key.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_lamp.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_lattice.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_main.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_main_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_mask.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_material.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_mesh.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_meta.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_modifier.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_movieclip.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_nla.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_object.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_object_force.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_packedfile.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_particle.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_pose.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_render.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_rna.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_scene.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_scene_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sensor.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sensor_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sequencer.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_space.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_text_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_texture.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_texture_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_timeline.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_tracking.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_ui.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_ui_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_userdef.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_wm.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_wm_api.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_array.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_bevel.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_build.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_cast.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_cloth.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_laplaciansmooth.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_mask.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_meshcache.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_meshcache_pc2.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_skin.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_solidify.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_subsurf.c
    branches/ge_harmony/source/blender/nodes/composite/node_composite_tree.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_trackpos.c
    branches/ge_harmony/source/blender/nodes/intern/node_exec.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_ops.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_ops_call.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types.h
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types_meshdata.h
    branches/ge_harmony/source/blender/python/generic/bpy_internal_import.c
    branches/ge_harmony/source/blender/python/generic/idprop_py_api.c
    branches/ge_harmony/source/blender/python/generic/py_capi_utils.c
    branches/ge_harmony/source/blender/python/intern/bpy.c
    branches/ge_harmony/source/blender/python/intern/bpy_app.c
    branches/ge_harmony/source/blender/python/intern/bpy_app_translations.c
    branches/ge_harmony/source/blender/python/intern/bpy_driver.c
    branches/ge_harmony/source/blender/python/intern/bpy_interface.c
    branches/ge_harmony/source/blender/python/intern/bpy_interface_atexit.c
    branches/ge_harmony/source/blender/python/intern/bpy_library.c
    branches/ge_harmony/source/blender/python/intern/bpy_operator.c
    branches/ge_harmony/source/blender/python/intern/bpy_operator_wrap.c
    branches/ge_harmony/source/blender/python/intern/bpy_props.c
    branches/ge_harmony/source/blender/python/intern/bpy_rna.c
    branches/ge_harmony/source/blender/python/intern/bpy_rna_anim.c
    branches/ge_harmony/source/blender/python/intern/bpy_traceback.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Matrix.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_noise.c
    branches/ge_harmony/source/blender/quicktime/apple/qtkit_import.m
    branches/ge_harmony/source/blender/quicktime/apple/quicktime_export.c
    branches/ge_harmony/source/blender/quicktime/apple/quicktime_import.c
    branches/ge_harmony/source/blender/render/CMakeLists.txt
    branches/ge_harmony/source/blender/render/SConscript
    branches/ge_harmony/source/blender/render/extern/include/RE_engine.h
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/reorganize.h
    branches/ge_harmony/source/blender/render/intern/source/bake.c
    branches/ge_harmony/source/blender/render/intern/source/convertblender.c
    branches/ge_harmony/source/blender/render/intern/source/envmap.c
    branches/ge_harmony/source/blender/render/intern/source/external_engine.c
    branches/ge_harmony/source/blender/render/intern/source/imagetexture.c
    branches/ge_harmony/source/blender/render/intern/source/occlusion.c
    branches/ge_harmony/source/blender/render/intern/source/pipeline.c
    branches/ge_harmony/source/blender/render/intern/source/pointdensity.c
    branches/ge_harmony/source/blender/render/intern/source/rayshade.c
    branches/ge_harmony/source/blender/render/intern/source/render_result.c
    branches/ge_harmony/source/blender/render/intern/source/sss.c
    branches/ge_harmony/source/blender/render/intern/source/volume_precache.c
    branches/ge_harmony/source/blender/render/intern/source/voxeldata.c
    branches/ge_harmony/source/blender/windowmanager/WM_api.h
    branches/ge_harmony/source/blender/windowmanager/WM_types.h
    branches/ge_harmony/source/blender/windowmanager/intern/wm.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_event_system.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_files.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_gesture.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_init_exit.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_jobs.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_keymap.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_operators.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_playanim.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_subwindow.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_window.c
    branches/ge_harmony/source/blender/windowmanager/wm_event_types.h
    branches/ge_harmony/source/blender/windowmanager/wm_window.h
    branches/ge_harmony/source/blenderplayer/CMakeLists.txt
    branches/ge_harmony/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/ge_harmony/source/creator/CMakeLists.txt
    branches/ge_harmony/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/ge_harmony/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/ge_harmony/source/gameengine/Expressions/Value.h
    branches/ge_harmony/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/ge_harmony/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
    branches/ge_harmony/source/gameengine/GameLogic/SCA_IActuator.h
    branches/ge_harmony/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_Canvas.h
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_Engine.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_Engine.h
    branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/ge_harmony/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/ge_harmony/source/gameengine/Ketsji/CMakeLists.txt
    branches/ge_harmony/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_IpoConvert.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_IpoConvert.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/ge_harmony/source/gameengine/Network/NG_NetworkScene.h
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.h
    branches/ge_harmony/source/gameengine/VideoTexture/PyTypeList.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/ge_harmony/source/tests/CMakeLists.txt
    branches/ge_harmony/source/tests/bl_pyapi_mathutils.py
    branches/ge_harmony/source/tests/bl_run_operators.py
    branches/ge_harmony/source/tools/check_style_c.py

Added Paths:
-----------
    branches/ge_harmony/build_files/buildbot/config/user-config-mac-i386.py
    branches/ge_harmony/build_files/buildbot/config/user-config-mac-x86_64.py
    branches/ge_harmony/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.h
    branches/ge_harmony/extern/bullet2/src/LinearMath/btPolarDecomposition.cpp
    branches/ge_harmony/extern/bullet2/src/LinearMath/btPolarDecomposition.h
    branches/ge_harmony/extern/bullet2/src/LinearMath/btVector3.cpp
    branches/ge_harmony/extern/libmv/libmv/multiview/panography.h
    branches/ge_harmony/extern/wcwidth/
    branches/ge_harmony/release/datafiles/fonts/bmonofont-i18n.ttf.gz
    branches/ge_harmony/release/scripts/presets/interaction/3dsmax.py
    branches/ge_harmony/release/scripts/presets/keyconfig/3dsmax.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_constraint.py
    branches/ge_harmony/source/blender/editors/armature/armature_add.c
    branches/ge_harmony/source/blender/editors/armature/armature_edit.c
    branches/ge_harmony/source/blender/editors/armature/armature_naming.c
    branches/ge_harmony/source/blender/editors/armature/armature_relations.c
    branches/ge_harmony/source/blender/editors/armature/armature_select.c
    branches/ge_harmony/source/blender/editors/armature/armature_skinning.c
    branches/ge_harmony/source/blender/editors/armature/armature_utils.c
    branches/ge_harmony/source/blender/editors/armature/pose_edit.c
    branches/ge_harmony/source/blender/editors/armature/pose_group.c
    branches/ge_harmony/source/blender/editors/armature/pose_lib.c
    branches/ge_harmony/source/blender/editors/armature/pose_select.c
    branches/ge_harmony/source/blender/editors/armature/pose_slide.c
    branches/ge_harmony/source/blender/editors/armature/pose_transform.c
    branches/ge_harmony/source/blender/editors/armature/pose_utils.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_knife_project.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_image_proj.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_ruler.c
    branches/ge_harmony/source/blender/gpu/GPU_simple_shader.h
    branches/ge_harmony/source/blender/gpu/intern/gpu_simple_shader.c
    branches/ge_harmony/source/blender/gpu/shaders/gpu_shader_simple_frag.glsl
    branches/ge_harmony/source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
    branches/ge_harmony/source/tests/bl_keymap_completeness.py

Removed Paths:
-------------
    branches/ge_harmony/extern/bullet2/patches/make_id.patch
    branches/ge_harmony/extern/bullet2/patches/pvs_warning_fixes.patch
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/rigid_registration.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/rigid_registration.h
    branches/ge_harmony/extern/libmv/patches/v3d_verbosity.patch
    branches/ge_harmony/extern/libmv/third_party/ldl/CMakeLists.txt
    branches/ge_harmony/extern/libmv/third_party/ldl/Doc/ChangeLog
    branches/ge_harmony/extern/libmv/third_party/ldl/Doc/lesser.txt
    branches/ge_harmony/extern/libmv/third_party/ldl/Include/ldl.h
    branches/ge_harmony/extern/libmv/third_party/ldl/README.libmv
    branches/ge_harmony/extern/libmv/third_party/ldl/README.txt
    branches/ge_harmony/extern/libmv/third_party/ldl/Source/ldl.c
    branches/ge_harmony/extern/libmv/third_party/ssba/COPYING.TXT
    branches/ge_harmony/extern/libmv/third_party/ssba/Geometry/v3d_cameramatrix.h
    branches/ge_harmony/extern/libmv/third_party/ssba/Geometry/v3d_distortion.h
    branches/ge_harmony/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.cpp
    branches/ge_harmony/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.h
    branches/ge_harmony/extern/libmv/third_party/ssba/Math/v3d_linear.h
    branches/ge_harmony/extern/libmv/third_party/ssba/Math/v3d_linear_utils.h
    branches/ge_harmony/extern/libmv/third_party/ssba/Math/v3d_mathutilities.h
    branches/ge_harmony/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
    branches/ge_harmony/extern/libmv/third_party/ssba/Math/v3d_optimization.h
    branches/ge_harmony/extern/libmv/third_party/ssba/README.TXT
    branches/ge_harmony/extern/libmv/third_party/ssba/README.libmv
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/ge_harmony/source/blender/bmesh/operators/bmo_subdivide.h
    branches/ge_harmony/source/blender/editors/armature/editarmature.c
    branches/ge_harmony/source/blender/editors/armature/poseSlide.c
    branches/ge_harmony/source/blender/editors/armature/poseUtils.c
    branches/ge_harmony/source/blender/editors/armature/poselib.c
    branches/ge_harmony/source/blender/editors/armature/poseobject.c

Property Changed:
----------------
    branches/ge_harmony/
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
    branches/ge_harmony/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
    branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/cost_function_to_functor.h
    branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/dynamic_autodiff_cost_function.h
    branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/gradient_checker.h
    branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/internal/variadic_evaluate.h
    branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/numeric_diff_functor.h
    branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/ordered_groups.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/coordinate_descent_minimizer.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/line_search.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/line_search.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/preconditioner.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.h
    branches/ge_harmony/source/blender/editors/interface/interface.c
    branches/ge_harmony/source/blender/editors/space_outliner/


Property changes on: branches/ge_harmony
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:48067-54857
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:48067-55361

Modified: branches/ge_harmony/CMakeLists.txt
===================================================================
--- branches/ge_harmony/CMakeLists.txt	2013-03-17 20:24:47 UTC (rev 55363)
+++ branches/ge_harmony/CMakeLists.txt	2013-03-17 22:29:48 UTC (rev 55364)
@@ -278,6 +278,10 @@
 
 option(WITH_BOOST					"Enable features depending no boost" ON)
 
+if(CMAKE_COMPILER_IS_GNUCC)
+	option(WITH_GCC_MUDFLAP			"Enable mudflap" OFF)
+	mark_as_advanced(WITH_GCC_MUDFLAP)
+endif()
 
 if(APPLE)
 	cmake_minimum_required(VERSION 2.8.8)
@@ -1930,6 +1934,11 @@
 		ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNINITIALIZED -Wuninitialized)
 	endif()
 
+	# versions before gcc4.6 give many BLI_math warnings
+	if (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.6")
+		ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_REDUNDANT_DECLS -Wredundant-decls)
+	endif()
+
 	# disable because it gives warnings for printf() & friends.
 	# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion)
 
@@ -1944,6 +1953,7 @@
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_INIT_SELF -Winit-self)  # needs -Wuninitialized
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero)
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_REDUNDANT_DECLS -Wredundant-decls)
 
 	# gcc 4.2 gives annoying warnings on every file with this
 	if (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
@@ -1968,21 +1978,32 @@
 
 	# strange, clang complains these are not supported, but then yses them.
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_DECLARATION_AFTER_STATEMENT -Werror=declaration-after-statement)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_RETURN_TYPE  -Werror=return-type)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_STRICT_PROTOTYPES  -Wstrict-prototypes)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_MISSING_PROTOTYPES -Wmissing-prototypes)
-	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_MACROS      -Wunused-macros)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
 
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_UNKNOWN_PRAGMAS     -Wno-unknown-pragmas)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_CHAR_SUBSCRIPTS     -Wno-char-subscripts)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_OVERLOADED_VIRTUAL  -Wno-overloaded-virtual)  # we get a lot of these, if its a problem a dev needs to look into it.
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE        -Wno-sign-compare)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF    -Wno-invalid-offsetof)
-	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNUSED_MACROS          -Wunused-macros)
 
+	# gives too many unfixable warnings
+	# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_MACROS      -Wunused-macros)
+	# ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNUSED_MACROS          -Wunused-macros)
+
+	# flags to undo strict flags
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS    -Wno-unused-macros)
+
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
@@ -2019,7 +2040,7 @@
 
 	if(WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY)
 		# set but invalid
-        # -- disabled until we make numpy bundled with blender - campbell
+		# -- disabled until we make numpy bundled with blender - campbell
 		if((NOT ${PYTHON_NUMPY_PATH} STREQUAL "") AND (NOT ${PYTHON_NUMPY_PATH} MATCHES NOTFOUND))
 #			if(NOT EXISTS "${PYTHON_NUMPY_PATH}/numpy")
 #				message(WARNING "PYTHON_NUMPY_PATH is invalid, numpy not found in '${PYTHON_NUMPY_PATH}' "
@@ -2063,6 +2084,13 @@
 	endif()
 endif()
 
+if(WITH_GCC_MUDFLAP)
+	set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -fmudflapth -funwind-tables")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lpthread -lmudflapth -rdynamic")
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS     C_WARN_NO_ERROR_MUDFLAP   -Wno-error=mudflap)
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_ERROR_MUDFLAP -Wno-error=mudflap)
+endif()
+
 # Include warnings first, so its possible to disable them with user defined flags
 # eg: -Wno-uninitialized
 set(CMAKE_C_FLAGS "${C_WARNINGS} ${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS}")

Modified: branches/ge_harmony/SConstruct
===================================================================
--- branches/ge_harmony/SConstruct	2013-03-17 20:24:47 UTC (rev 55363)
+++ branches/ge_harmony/SConstruct	2013-03-17 22:29:48 UTC (rev 55364)
@@ -526,17 +526,16 @@
     data_to_c_simple("release/datafiles/preview.blend")
     data_to_c_simple("release/datafiles/preview_cycles.blend")
 
-# --- glsl ---
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_light_frag.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_light_vert.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_prepass_frag.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_prepass_vert.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl")
-data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl")
+    # --- glsl ---
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_simple_frag.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_simple_vert.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl")
 
     # --- blender ---
     data_to_c_simple("release/datafiles/bfont.pfb")

Copied: branches/ge_harmony/build_files/buildbot/config/user-config-mac-i386.py (from rev 55361, trunk/blender/build_files/buildbot/config/user-config-mac-i386.py)
===================================================================
--- branches/ge_harmony/build_files/buildbot/config/user-config-mac-i386.py	                        (rev 0)
+++ branches/ge_harmony/build_files/buildbot/config/user-config-mac-i386.py	2013-03-17 22:29:48 UTC (rev 55364)
@@ -0,0 +1,420 @@
+#
+# Note : if you want to alter this file
+# copy it as a whole in the upper folder
+# as user-config.py
+# dont create a new file with only some
+# vars changed.
+
+import commands
+
+# IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs
+USE_SDK=True
+
+#############################################################################
+###################     Cocoa & architecture settings      ##################
+#############################################################################
+WITH_GHOST_COCOA=True
+MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
+
+
+cmd = 'uname -p'
+MAC_PROC=commands.getoutput(cmd)
+cmd = 'uname -r'
+cmd_res=commands.getoutput(cmd)
+
+if cmd_res[:1]=='7':
+    MAC_CUR_VER='10.3'
+elif cmd_res[:1]=='8':
+    MAC_CUR_VER='10.4'
+elif cmd_res[:1]=='9':
+    MAC_CUR_VER='10.5'
+elif cmd_res[:2]=='10':
+    MAC_CUR_VER='10.6'
+elif cmd_res[:2]=='11':
+    MAC_CUR_VER='10.7'
+elif cmd_res[:2]=='12':
+    MAC_CUR_VER='10.8'
+cmd = 'xcodebuild -version'
+cmd_xcode=commands.getoutput(cmd)
+XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
+cmd = 'xcodebuild -showsdks'
+cmd_sdk=commands.getoutput(cmd)
+MACOSX_SDK_CHECK=cmd_sdk
+
+if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':

@@ Diff output truncated at 10240 characters. @@