[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56000] branches/ge_harmony: Merged revisions 55362-55932 from trunk/blender

Daniel Stokes kupomail at gmail.com
Sat Apr 13 05:07:53 CEST 2013


Revision: 56000
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56000
Author:   kupoman
Date:     2013-04-13 03:07:49 +0000 (Sat, 13 Apr 2013)
Log Message:
-----------
Merged revisions 55362-55932 from trunk/blender

Modified Paths:
--------------
    branches/ge_harmony/CMakeLists.txt
    branches/ge_harmony/GNUmakefile
    branches/ge_harmony/SConstruct
    branches/ge_harmony/build_files/build_environment/install_deps.sh
    branches/ge_harmony/build_files/buildbot/config/user-config-glibc211-i686.py
    branches/ge_harmony/build_files/buildbot/config/user-config-glibc211-x86_64.py
    branches/ge_harmony/build_files/buildbot/config/user-config-player-glibc211-i686.py
    branches/ge_harmony/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
    branches/ge_harmony/build_files/buildbot/slave_compile.py
    branches/ge_harmony/build_files/cmake/cmake_static_check_cppcheck.py
    branches/ge_harmony/build_files/cmake/config/blender_lite.cmake
    branches/ge_harmony/build_files/cmake/macros.cmake
    branches/ge_harmony/build_files/scons/config/darwin-config.py
    branches/ge_harmony/build_files/scons/config/freebsd7-config.py
    branches/ge_harmony/build_files/scons/config/freebsd8-config.py
    branches/ge_harmony/build_files/scons/config/freebsd9-config.py
    branches/ge_harmony/build_files/scons/config/linux-config.py
    branches/ge_harmony/build_files/scons/config/linuxcross-config.py
    branches/ge_harmony/build_files/scons/config/win32-mingw-config.py
    branches/ge_harmony/build_files/scons/config/win32-vc-config.py
    branches/ge_harmony/build_files/scons/config/win64-mingw-config.py
    branches/ge_harmony/build_files/scons/config/win64-vc-config.py
    branches/ge_harmony/build_files/scons/tools/Blender.py
    branches/ge_harmony/build_files/scons/tools/btools.py
    branches/ge_harmony/doc/python_api/rst/bge.logic.rst
    branches/ge_harmony/doc/python_api/rst/bge.render.rst
    branches/ge_harmony/doc/python_api/sphinx_doc_gen.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/carve/lib/intersect_face_division.cpp
    branches/ge_harmony/extern/libmv/CMakeLists.txt
    branches/ge_harmony/extern/libmv/ChangeLog
    branches/ge_harmony/extern/libmv/files.txt
    branches/ge_harmony/extern/libmv/libmv/base/vector.h
    branches/ge_harmony/extern/libmv/libmv/base/vector_utils.h
    branches/ge_harmony/extern/libmv/libmv/image/array_nd.cc
    branches/ge_harmony/extern/libmv/libmv/image/array_nd.h
    branches/ge_harmony/extern/libmv/libmv/image/convolve.cc
    branches/ge_harmony/extern/libmv/libmv/image/convolve.h
    branches/ge_harmony/extern/libmv/libmv/image/correlation.h
    branches/ge_harmony/extern/libmv/libmv/image/image.h
    branches/ge_harmony/extern/libmv/libmv/image/sample.h
    branches/ge_harmony/extern/libmv/libmv/image/tuple.h
    branches/ge_harmony/extern/libmv/libmv/multiview/conditioning.cc
    branches/ge_harmony/extern/libmv/libmv/multiview/conditioning.h
    branches/ge_harmony/extern/libmv/libmv/multiview/euclidean_resection.cc
    branches/ge_harmony/extern/libmv/libmv/multiview/euclidean_resection.h
    branches/ge_harmony/extern/libmv/libmv/multiview/fundamental.cc
    branches/ge_harmony/extern/libmv/libmv/multiview/homography.cc
    branches/ge_harmony/extern/libmv/libmv/multiview/homography.h
    branches/ge_harmony/extern/libmv/libmv/multiview/homography_parameterization.h
    branches/ge_harmony/extern/libmv/libmv/multiview/nviewtriangulation.h
    branches/ge_harmony/extern/libmv/libmv/multiview/panography.h
    branches/ge_harmony/extern/libmv/libmv/multiview/projection.cc
    branches/ge_harmony/extern/libmv/libmv/multiview/projection.h
    branches/ge_harmony/extern/libmv/libmv/multiview/resection.h
    branches/ge_harmony/extern/libmv/libmv/multiview/triangulation.cc
    branches/ge_harmony/extern/libmv/libmv/multiview/triangulation.h
    branches/ge_harmony/extern/libmv/libmv/numeric/dogleg.h
    branches/ge_harmony/extern/libmv/libmv/numeric/function_derivative.h
    branches/ge_harmony/extern/libmv/libmv/numeric/levenberg_marquardt.h
    branches/ge_harmony/extern/libmv/libmv/numeric/numeric.cc
    branches/ge_harmony/extern/libmv/libmv/numeric/numeric.h
    branches/ge_harmony/extern/libmv/libmv/numeric/poly.cc
    branches/ge_harmony/extern/libmv/libmv/numeric/poly.h
    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/callbacks.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/detect.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/detect.h
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/intersect.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/intersect.h
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/modal_solver.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/modal_solver.h
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/pipeline.h
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/reconstruction.h
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/resect.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/resect.h
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/tracks.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/brute_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/brute_region_tracker.h
    branches/ge_harmony/extern/libmv/libmv/tracking/esm_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/esm_region_tracker.h
    branches/ge_harmony/extern/libmv/libmv/tracking/hybrid_region_tracker.h
    branches/ge_harmony/extern/libmv/libmv/tracking/klt_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/klt_region_tracker.h
    branches/ge_harmony/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/lmicklt_region_tracker.h
    branches/ge_harmony/extern/libmv/libmv/tracking/pyramid_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/retrack_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/track_region.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/trklt_region_tracker.cc
    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/files.txt
    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/internal/autodiff.h
    branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/jet.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/problem.h
    branches/ge_harmony/extern/libmv/third_party/ceres/include/ceres/rotation.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.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.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_direction.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.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/schur_eliminator_impl.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/solver_impl.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/suitesparse.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/visibility.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/visibility.h
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc
    branches/ge_harmony/extern/libmv/third_party/fast/fast_10.c
    branches/ge_harmony/extern/libmv/third_party/fast/fast_11.c
    branches/ge_harmony/extern/libmv/third_party/fast/fast_12.c
    branches/ge_harmony/extern/libmv/third_party/fast/fast_9.c
    branches/ge_harmony/extern/libmv/third_party/gflags/gflags_completions.cc
    branches/ge_harmony/extern/libmv/third_party/glog/src/logging.cc
    branches/ge_harmony/extern/libmv/third_party/glog/src/utilities.cc
    branches/ge_harmony/extern/libmv/third_party/glog/src/vlog_is_on.cc
    branches/ge_harmony/extern/recastnavigation/recast-capi.cpp
    branches/ge_harmony/extern/wcwidth/CMakeLists.txt
    branches/ge_harmony/intern/audaspace/CMakeLists.txt
    branches/ge_harmony/intern/audaspace/SConscript
    branches/ge_harmony/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/ge_harmony/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
    branches/ge_harmony/intern/audaspace/intern/AUD_C-API.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_C-API.h
    branches/ge_harmony/intern/audaspace/jack/AUD_JackDevice.cpp
    branches/ge_harmony/intern/audaspace/jack/AUD_JackDevice.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_mesh.cpp
    branches/ge_harmony/intern/cycles/blender/blender_python.cpp
    branches/ge_harmony/intern/cycles/blender/blender_session.cpp
    branches/ge_harmony/intern/cycles/blender/blender_shader.cpp
    branches/ge_harmony/intern/cycles/blender/blender_sync.cpp
    branches/ge_harmony/intern/cycles/blender/blender_util.h
    branches/ge_harmony/intern/cycles/bvh/bvh_params.h
    branches/ge_harmony/intern/cycles/device/device_memory.h
    branches/ge_harmony/intern/cycles/kernel/CMakeLists.txt
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf.h
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf_microfacet.h
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf_refraction.h
    branches/ge_harmony/intern/cycles/kernel/kernel_bvh.h
    branches/ge_harmony/intern/cycles/kernel/kernel_camera.h
    branches/ge_harmony/intern/cycles/kernel/kernel_compat_cpu.h
    branches/ge_harmony/intern/cycles/kernel/kernel_compat_cuda.h
    branches/ge_harmony/intern/cycles/kernel/kernel_compat_opencl.h
    branches/ge_harmony/intern/cycles/kernel/kernel_displace.h
    branches/ge_harmony/intern/cycles/kernel/kernel_emission.h
    branches/ge_harmony/intern/cycles/kernel/kernel_globals.h
    branches/ge_harmony/intern/cycles/kernel/kernel_path.h
    branches/ge_harmony/intern/cycles/kernel/kernel_random.h
    branches/ge_harmony/intern/cycles/kernel/kernel_shader.h
    branches/ge_harmony/intern/cycles/kernel/kernel_textures.h
    branches/ge_harmony/intern/cycles/kernel/kernel_types.h
    branches/ge_harmony/intern/cycles/kernel/osl/CMakeLists.txt
    branches/ge_harmony/intern/cycles/kernel/osl/osl_closures.cpp
    branches/ge_harmony/intern/cycles/kernel/osl/osl_closures.h
    branches/ge_harmony/intern/cycles/kernel/osl/osl_shader.cpp
    branches/ge_harmony/intern/cycles/kernel/shaders/CMakeLists.txt
    branches/ge_harmony/intern/cycles/kernel/shaders/node_brightness.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_color.h
    branches/ge_harmony/intern/cycles/kernel/shaders/node_environment_texture.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_image_texture.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_normal_map.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_sky_texture.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_texture.h
    branches/ge_harmony/intern/cycles/kernel/shaders/node_vector_curves.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_ward_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/stdosl.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_closure.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_image.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_types.h
    branches/ge_harmony/intern/cycles/render/CMakeLists.txt
    branches/ge_harmony/intern/cycles/render/attribute.cpp
    branches/ge_harmony/intern/cycles/render/film.cpp
    branches/ge_harmony/intern/cycles/render/film.h
    branches/ge_harmony/intern/cycles/render/graph.cpp
    branches/ge_harmony/intern/cycles/render/graph.h
    branches/ge_harmony/intern/cycles/render/integrator.cpp
    branches/ge_harmony/intern/cycles/render/integrator.h
    branches/ge_harmony/intern/cycles/render/light.cpp
    branches/ge_harmony/intern/cycles/render/mesh.cpp
    branches/ge_harmony/intern/cycles/render/nodes.cpp
    branches/ge_harmony/intern/cycles/render/nodes.h
    branches/ge_harmony/intern/cycles/render/osl.cpp
    branches/ge_harmony/intern/cycles/render/osl.h
    branches/ge_harmony/intern/cycles/render/scene.cpp
    branches/ge_harmony/intern/cycles/render/scene.h
    branches/ge_harmony/intern/cycles/render/session.cpp
    branches/ge_harmony/intern/cycles/render/shader.cpp
    branches/ge_harmony/intern/cycles/render/shader.h
    branches/ge_harmony/intern/cycles/render/svm.cpp
    branches/ge_harmony/intern/cycles/render/svm.h
    branches/ge_harmony/intern/cycles/render/tile.h
    branches/ge_harmony/intern/cycles/util/util_boundbox.h
    branches/ge_harmony/intern/cycles/util/util_math.h
    branches/ge_harmony/intern/cycles/util/util_transform.cpp
    branches/ge_harmony/intern/cycles/util/util_transform.h
    branches/ge_harmony/intern/dualcon/intern/octree.h
    branches/ge_harmony/intern/elbeem/intern/solver_class.h
    branches/ge_harmony/intern/elbeem/intern/solver_init.cpp
    branches/ge_harmony/intern/ffmpeg/ffmpeg_compat.h
    branches/ge_harmony/intern/ghost/CMakeLists.txt
    branches/ge_harmony/intern/ghost/SConscript
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemNULL.h
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowNULL.h
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowWin32.h
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/ge_harmony/intern/guardedalloc/MEM_guardedalloc.h
    branches/ge_harmony/intern/guardedalloc/MEM_sys_types.h
    branches/ge_harmony/intern/itasc/Armature.cpp
    branches/ge_harmony/intern/memutil/MEM_CacheLimiter.h
    branches/ge_harmony/intern/memutil/MEM_CacheLimiterC-Api.h
    branches/ge_harmony/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/ge_harmony/intern/opencolorio/CMakeLists.txt
    branches/ge_harmony/intern/opencolorio/SConscript
    branches/ge_harmony/intern/opencolorio/fallback_impl.cc
    branches/ge_harmony/intern/opencolorio/ocio_capi.cc
    branches/ge_harmony/intern/opencolorio/ocio_capi.h
    branches/ge_harmony/intern/opencolorio/ocio_impl.cc
    branches/ge_harmony/intern/opencolorio/ocio_impl.h
    branches/ge_harmony/intern/opennl/superlu/superlu_sys_types.h
    branches/ge_harmony/intern/raskter/raskter.c
    branches/ge_harmony/intern/rigidbody/CMakeLists.txt
    branches/ge_harmony/intern/smoke/intern/smoke_API.cpp
    branches/ge_harmony/intern/string/STR_String.h
    branches/ge_harmony/intern/tools/dump_rna2xml.py
    branches/ge_harmony/intern/utfconv/utf_winfunc.c
    branches/ge_harmony/intern/utfconv/utf_winfunc.h
    branches/ge_harmony/intern/utfconv/utfconv.h
    branches/ge_harmony/release/datafiles/blender_icons.svg
    branches/ge_harmony/release/datafiles/blender_icons16.png
    branches/ge_harmony/release/datafiles/blender_icons32.png
    branches/ge_harmony/release/datafiles/colormanagement/config.ocio
    branches/ge_harmony/release/datafiles/startup.blend
    branches/ge_harmony/release/scripts/modules/addon_utils.py
    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/utils.py
    branches/ge_harmony/release/scripts/modules/bpy/path.py
    branches/ge_harmony/release/scripts/modules/bpy/utils.py
    branches/ge_harmony/release/scripts/modules/bpy_extras/anim_utils.py
    branches/ge_harmony/release/scripts/modules/bpy_extras/image_utils.py
    branches/ge_harmony/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/ge_harmony/release/scripts/modules/bpy_extras/object_utils.py
    branches/ge_harmony/release/scripts/modules/bpy_types.py
    branches/ge_harmony/release/scripts/modules/console/complete_import.py
    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_operators/__init__.py
    branches/ge_harmony/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/ge_harmony/release/scripts/startup/bl_operators/image.py
    branches/ge_harmony/release/scripts/startup/bl_operators/node.py
    branches/ge_harmony/release/scripts/startup/bl_operators/object.py
    branches/ge_harmony/release/scripts/startup/bl_operators/presets.py
    branches/ge_harmony/release/scripts/startup/bl_operators/rigidbody.py
    branches/ge_harmony/release/scripts/startup/bl_operators/uvcalc_smart_project.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_object.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_paint_common.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_particle.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_render.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_clip.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_image.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_info.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_time.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/text/readme.html
    branches/ge_harmony/release/windows/contrib/vfapi/vfapi-plugin.c
    branches/ge_harmony/source/blender/CMakeLists.txt
    branches/ge_harmony/source/blender/SConscript
    branches/ge_harmony/source/blender/avi/intern/avi_intern.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_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_anim.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_camera.h
    branches/ge_harmony/source/blender/blenkernel/BKE_curve.h
    branches/ge_harmony/source/blender/blenkernel/BKE_customdata.h
    branches/ge_harmony/source/blender/blenkernel/BKE_deform.h
    branches/ge_harmony/source/blender/blenkernel/BKE_displist.h
    branches/ge_harmony/source/blender/blenkernel/BKE_effect.h
    branches/ge_harmony/source/blender/blenkernel/BKE_global.h
    branches/ge_harmony/source/blender/blenkernel/BKE_group.h
    branches/ge_harmony/source/blender/blenkernel/BKE_idcode.h
    branches/ge_harmony/source/blender/blenkernel/BKE_idprop.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_material.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_multires.h
    branches/ge_harmony/source/blender/blenkernel/BKE_nla.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_particle.h
    branches/ge_harmony/source/blender/blenkernel/BKE_pbvh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_rigidbody.h
    branches/ge_harmony/source/blender/blenkernel/BKE_sequencer.h
    branches/ge_harmony/source/blender/blenkernel/BKE_sketch.h
    branches/ge_harmony/source/blender/blenkernel/BKE_smoke.h
    branches/ge_harmony/source/blender/blenkernel/BKE_softbody.h
    branches/ge_harmony/source/blender/blenkernel/BKE_sound.h
    branches/ge_harmony/source/blender/blenkernel/BKE_texture.h
    branches/ge_harmony/source/blender/blenkernel/CMakeLists.txt
    branches/ge_harmony/source/blender/blenkernel/SConscript
    branches/ge_harmony/source/blender/blenkernel/depsgraph_private.h
    branches/ge_harmony/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/ge_harmony/source/blender/blenkernel/intern/DerivedMesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/action.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/blender.c
    branches/ge_harmony/source/blender/blenkernel/intern/bmfont.c
    branches/ge_harmony/source/blender/blenkernel/intern/bpath.c
    branches/ge_harmony/source/blender/blenkernel/intern/brush.c
    branches/ge_harmony/source/blender/blenkernel/intern/camera.c
    branches/ge_harmony/source/blender/blenkernel/intern/cdderivedmesh.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/curve.c
    branches/ge_harmony/source/blender/blenkernel/intern/customdata.c
    branches/ge_harmony/source/blender/blenkernel/intern/deform.c
    branches/ge_harmony/source/blender/blenkernel/intern/displist.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/gpencil.c
    branches/ge_harmony/source/blender/blenkernel/intern/group.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/ipo.c
    branches/ge_harmony/source/blender/blenkernel/intern/key.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/multires.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/particle.c
    branches/ge_harmony/source/blender/blenkernel/intern/particle_system.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/rigidbody.c
    branches/ge_harmony/source/blender/blenkernel/intern/sca.c
    branches/ge_harmony/source/blender/blenkernel/intern/scene.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/smoke.c
    branches/ge_harmony/source/blender/blenkernel/intern/sound.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/writeavi.c
    branches/ge_harmony/source/blender/blenkernel/intern/writeffmpeg.c
    branches/ge_harmony/source/blender/blenkernel/nla_private.h
    branches/ge_harmony/source/blender/blenlib/BLI_array.h
    branches/ge_harmony/source/blender/blenlib/BLI_callbacks.h
    branches/ge_harmony/source/blender/blenlib/BLI_fileops.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_listbase.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_geom.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_rotation.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_vfontdata.h
    branches/ge_harmony/source/blender/blenlib/CMakeLists.txt
    branches/ge_harmony/source/blender/blenlib/intern/BLI_dynstr.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_ghash.c
    branches/ge_harmony/source/blender/blenlib/intern/DLRB_tree.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/graph.c
    branches/ge_harmony/source/blender/blenlib/intern/gsqueue.c
    branches/ge_harmony/source/blender/blenlib/intern/listbase.c
    branches/ge_harmony/source/blender/blenlib/intern/math_color.c
    branches/ge_harmony/source/blender/blenlib/intern/math_geom.c
    branches/ge_harmony/source/blender/blenlib/intern/math_interp.c
    branches/ge_harmony/source/blender/blenlib/intern/math_rotation.c
    branches/ge_harmony/source/blender/blenlib/intern/math_vector.c
    branches/ge_harmony/source/blender/blenlib/intern/math_vector_inline.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/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/voronoi.c
    branches/ge_harmony/source/blender/blenloader/BLO_sys_types.h
    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/runtime.c
    branches/ge_harmony/source/blender/blenloader/intern/undofile.c
    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.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_construct.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_construct.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_core.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_interp.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_interp.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_marking.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_opdefines.c
    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.h
    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_private.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_structure.h
    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_dupe.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_inset.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_join_triangles.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_mesh_conv.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_mirror.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_primitive.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_similar.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_symmetrize.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_triangulate.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_unsubdivide.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_utils.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_decimate_collapse.c
    branches/ge_harmony/source/blender/collada/AnimationExporter.cpp
    branches/ge_harmony/source/blender/collada/AnimationImporter.cpp
    branches/ge_harmony/source/blender/collada/AnimationImporter.h
    branches/ge_harmony/source/blender/collada/ArmatureExporter.cpp
    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/ExtraHandler.cpp
    branches/ge_harmony/source/blender/collada/ExtraHandler.h
    branches/ge_harmony/source/blender/collada/GeometryExporter.cpp
    branches/ge_harmony/source/blender/collada/MeshImporter.cpp
    branches/ge_harmony/source/blender/collada/SConscript
    branches/ge_harmony/source/blender/collada/SceneExporter.cpp
    branches/ge_harmony/source/blender/collada/TransformWriter.cpp
    branches/ge_harmony/source/blender/collada/collada_internal.cpp
    branches/ge_harmony/source/blender/collada/collada_utils.cpp
    branches/ge_harmony/source/blender/compositor/CMakeLists.txt
    branches/ge_harmony/source/blender/compositor/intern/COM_CompositorContext.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_CompositorContext.h
    branches/ge_harmony/source/blender/compositor/intern/COM_Converter.cpp
    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/intern/COM_ExecutionSystemHelper.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
    branches/ge_harmony/source/blender/compositor/intern/COM_InputSocket.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_InputSocket.h
    branches/ge_harmony/source/blender/compositor/intern/COM_Node.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_Node.h
    branches/ge_harmony/source/blender/compositor/intern/COM_NodeBase.h
    branches/ge_harmony/source/blender/compositor/intern/COM_NodeOperation.h
    branches/ge_harmony/source/blender/compositor/intern/COM_Socket.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_Socket.h
    branches/ge_harmony/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_compositor.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ColorNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_CompositorNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_GroupNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_MovieClipNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_NormalNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_SocketProxyNode.h
    branches/ge_harmony/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ValueNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ViewerNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ZCombineNode.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_CompositorOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_CompositorOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_CropOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MixHueOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MovieClipOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MovieClipOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_OpenCLKernels.cl
    branches/ge_harmony/source/blender/compositor/operations/COM_OutputFileOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_PreviewOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_PreviewOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
    branches/ge_harmony/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_ZCombineOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_ZCombineOperation.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_markers.c
    branches/ge_harmony/source/blender/editors/animation/fmodifier_ui.c
    branches/ge_harmony/source/blender/editors/armature/armature_naming.c
    branches/ge_harmony/source/blender/editors/armature/armature_select.c
    branches/ge_harmony/source/blender/editors/armature/editarmature_sketch.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/reeb.c
    branches/ge_harmony/source/blender/editors/curve/editcurve.c
    branches/ge_harmony/source/blender/editors/gpencil/drawgpencil.c
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_buttons.c
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_edit.c
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_paint.c
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_undo.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_clip.h
    branches/ge_harmony/source/blender/editors/include/ED_curve.h
    branches/ge_harmony/source/blender/editors/include/ED_gpencil.h
    branches/ge_harmony/source/blender/editors/include/ED_image.h
    branches/ge_harmony/source/blender/editors/include/ED_mball.h
    branches/ge_harmony/source/blender/editors/include/ED_mesh.h
    branches/ge_harmony/source/blender/editors/include/ED_node.h
    branches/ge_harmony/source/blender/editors/include/ED_object.h
    branches/ge_harmony/source/blender/editors/include/ED_particle.h
    branches/ge_harmony/source/blender/editors/include/ED_physics.h
    branches/ge_harmony/source/blender/editors/include/ED_screen.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_types.h
    branches/ge_harmony/source/blender/editors/include/ED_util.h
    branches/ge_harmony/source/blender/editors/include/ED_view3d.h
    branches/ge_harmony/source/blender/editors/include/UI_icons.h
    branches/ge_harmony/source/blender/editors/include/UI_interface.h
    branches/ge_harmony/source/blender/editors/include/UI_interface_icons.h
    branches/ge_harmony/source/blender/editors/include/UI_resources.h
    branches/ge_harmony/source/blender/editors/include/UI_view2d.h
    branches/ge_harmony/source/blender/editors/interface/interface.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_templates.c
    branches/ge_harmony/source/blender/editors/interface/interface_utils.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/io/io_collada.c
    branches/ge_harmony/source/blender/editors/io/io_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/SConscript
    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_bvh.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_knife.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_knife_project.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/editmesh_utils.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_navmesh.c
    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/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_group.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_relations.c
    branches/ge_harmony/source/blender/editors/object/object_select.c
    branches/ge_harmony/source/blender/editors/object/object_vgroup.c
    branches/ge_harmony/source/blender/editors/physics/dynamicpaint_ops.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/rigidbody_constraint.c
    branches/ge_harmony/source/blender/editors/physics/rigidbody_object.c
    branches/ge_harmony/source/blender/editors/render/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/render/SConscript
    branches/ge_harmony/source/blender/editors/render/render_intern.h
    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_ops.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/screen/CMakeLists.txt
    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/paint_cursor.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_image_proj.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_intern.h
    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/sound/sound_ops.c
    branches/ge_harmony/source/blender/editors/space_action/action_intern.h
    branches/ge_harmony/source/blender/editors/space_action/action_select.c
    branches/ge_harmony/source/blender/editors/space_buttons/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/space_buttons/SConscript
    branches/ge_harmony/source/blender/editors/space_buttons/buttons_context.c
    branches/ge_harmony/source/blender/editors/space_buttons/buttons_header.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_buttons/space_buttons.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_buttons.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_dopesheet_draw.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_draw.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_editor.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_graph_draw.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_console/console_intern.h
    branches/ge_harmony/source/blender/editors/space_console/console_ops.c
    branches/ge_harmony/source/blender/editors/space_file/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/space_file/SConscript
    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/file_panels.c
    branches/ge_harmony/source/blender/editors/space_file/filelist.c
    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_draw.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_intern.h
    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_ops.c
    branches/ge_harmony/source/blender/editors/space_image/space_image.c
    branches/ge_harmony/source/blender/editors/space_info/space_info.c
    branches/ge_harmony/source/blender/editors/space_logic/logic_window.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_intern.h
    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_buttons.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_header.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_templates.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_select.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_tools.c
    branches/ge_harmony/source/blender/editors/space_outliner/space_outliner.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_buttons.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_intern.h
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_scopes.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_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_header.c
    branches/ge_harmony/source/blender/editors/space_text/text_intern.h
    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/SConscript
    branches/ge_harmony/source/blender/editors/space_view3d/drawarmature.c
    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/drawvolume.c
    branches/ge_harmony/source/blender/editors/space_view3d/space_view3d.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_buttons.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_ruler.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_select.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_snap.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_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/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/util/SConscript
    branches/ge_harmony/source/blender/editors/util/crazyspace.c
    branches/ge_harmony/source/blender/editors/util/ed_util.c
    branches/ge_harmony/source/blender/editors/util/undo.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/GPU_draw.h
    branches/ge_harmony/source/blender/gpu/GPU_material.h
    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/intern/gpu_simple_shader.c
    branches/ge_harmony/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/ge_harmony/source/blender/gpu/shaders/gpu_shader_simple_frag.glsl
    branches/ge_harmony/source/blender/imbuf/IMB_colormanagement.h
    branches/ge_harmony/source/blender/imbuf/IMB_imbuf.h
    branches/ge_harmony/source/blender/imbuf/IMB_moviecache.h
    branches/ge_harmony/source/blender/imbuf/intern/IMB_filetype.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/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/ColorBlock.cpp
    branches/ge_harmony/source/blender/imbuf/intern/dds/DirectDrawSurface.h
    branches/ge_harmony/source/blender/imbuf/intern/dds/Image.h
    branches/ge_harmony/source/blender/imbuf/intern/dds/PixelFormat.h
    branches/ge_harmony/source/blender/imbuf/intern/dds/dds_api.cpp
    branches/ge_harmony/source/blender/imbuf/intern/divers.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/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/makesdna/CMakeLists.txt
    branches/ge_harmony/source/blender/makesdna/DNA_ID.h
    branches/ge_harmony/source/blender/makesdna/DNA_action_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_brush_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_customdata_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_material_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_mesh_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_meshdata_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_node_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_scene_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_texture_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_userdef_types.h
    branches/ge_harmony/source/blender/makesdna/SConscript
    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_define.h
    branches/ge_harmony/source/blender/makesrna/RNA_enum_types.h
    branches/ge_harmony/source/blender/makesrna/SConscript
    branches/ge_harmony/source/blender/makesrna/intern/CMakeLists.txt
    branches/ge_harmony/source/blender/makesrna/intern/SConscript
    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_brush.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_controller.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_curve.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_define.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_dynamicpaint.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_internal.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_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_mesh_utils.h
    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_nodetree.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_object.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_object_api.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_rigidbody.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_sculpt_paint.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sensor.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sequencer.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_smoke.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_space.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_test.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_texture.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_world.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_cloth.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_mirror.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_ocean.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_screw.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_skin.c
    branches/ge_harmony/source/blender/nodes/CMakeLists.txt
    branches/ge_harmony/source/blender/nodes/NOD_composite.h
    branches/ge_harmony/source/blender/nodes/NOD_shader.h
    branches/ge_harmony/source/blender/nodes/NOD_socket.h
    branches/ge_harmony/source/blender/nodes/NOD_texture.h
    branches/ge_harmony/source/blender/nodes/composite/node_composite_tree.c
    branches/ge_harmony/source/blender/nodes/composite/node_composite_util.h
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_boxmask.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_despeckle.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_inpaint.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_keying.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_mapRange.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_mask.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_pixelate.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_switch.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_trackpos.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/ge_harmony/source/blender/nodes/intern/node_common.c
    branches/ge_harmony/source/blender/nodes/intern/node_common.h
    branches/ge_harmony/source/blender/nodes/intern/node_exec.c
    branches/ge_harmony/source/blender/nodes/intern/node_exec.h
    branches/ge_harmony/source/blender/nodes/intern/node_socket.c
    branches/ge_harmony/source/blender/nodes/intern/node_util.c
    branches/ge_harmony/source/blender/nodes/intern/node_util.h
    branches/ge_harmony/source/blender/nodes/shader/node_shader_tree.c
    branches/ge_harmony/source/blender/nodes/shader/node_shader_util.c
    branches/ge_harmony/source/blender/nodes/shader/node_shader_util.h
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_add_shader.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_attribute.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_background.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_brightness.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bump.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_common.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_emission.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_fresnel.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_gamma.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_geometry.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_hair_info.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_holdout.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_invert.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_light_path.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_normal.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_normal_map.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_object_info.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_output_material.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_output_world.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_particle_info.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_rgb.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_script.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tangent.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_value.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
    branches/ge_harmony/source/blender/nodes/texture/node_texture_tree.c
    branches/ge_harmony/source/blender/nodes/texture/node_texture_util.c
    branches/ge_harmony/source/blender/nodes/texture/node_texture_util.h
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_at.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_bricks.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_checker.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_compose.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_coord.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_curves.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_decompose.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_distance.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_invert.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_math.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_rotate.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_scale.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_translate.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_valToNor.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_viewer.c
    branches/ge_harmony/source/blender/python/SConscript
    branches/ge_harmony/source/blender/python/bmesh/CMakeLists.txt
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_ops.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types_customdata.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types_meshdata.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_utils.c
    branches/ge_harmony/source/blender/python/intern/CMakeLists.txt
    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_build_options.c
    branches/ge_harmony/source/blender/python/intern/bpy_app_ffmpeg.c
    branches/ge_harmony/source/blender/python/intern/bpy_app_translations.c
    branches/ge_harmony/source/blender/python/intern/bpy_library.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.h
    branches/ge_harmony/source/blender/python/intern/gpu.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils.h
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Color.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Vector.c
    branches/ge_harmony/source/blender/quicktime/apple/qtkit_export.m
    branches/ge_harmony/source/blender/quicktime/apple/qtkit_import.m
    branches/ge_harmony/source/blender/quicktime/quicktime_import.h
    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/extern/include/RE_pipeline.h
    branches/ge_harmony/source/blender/render/extern/include/RE_render_ext.h
    branches/ge_harmony/source/blender/render/intern/include/raycounter.h
    branches/ge_harmony/source/blender/render/intern/include/render_types.h
    branches/ge_harmony/source/blender/render/intern/include/zbuf.h
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_internal.h
    branches/ge_harmony/source/blender/render/intern/source/convertblender.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/pipeline.c
    branches/ge_harmony/source/blender/render/intern/source/render_result.c
    branches/ge_harmony/source/blender/render/intern/source/render_texture.c
    branches/ge_harmony/source/blender/render/intern/source/renderdatabase.c
    branches/ge_harmony/source/blender/render/intern/source/shadeoutput.c
    branches/ge_harmony/source/blender/render/intern/source/zbuf.c
    branches/ge_harmony/source/blender/windowmanager/WM_api.h
    branches/ge_harmony/source/blender/windowmanager/WM_keymap.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_cursors.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_draw.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_init_exit.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_window.c
    branches/ge_harmony/source/blender/windowmanager/wm_files.h
    branches/ge_harmony/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/ge_harmony/source/blenderplayer/bad_level_call_stubs/SConscript
    branches/ge_harmony/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/ge_harmony/source/creator/CMakeLists.txt
    branches/ge_harmony/source/creator/creator.c
    branches/ge_harmony/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderGL.h
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ArmatureConstraint.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/ge_harmony/source/gameengine/Expressions/EmptyValue.cpp
    branches/ge_harmony/source/gameengine/Expressions/KX_HashedPtr.cpp
    branches/ge_harmony/source/gameengine/Expressions/KX_HashedPtr.h
    branches/ge_harmony/source/gameengine/Expressions/ListValue.cpp
    branches/ge_harmony/source/gameengine/Expressions/Operator1Expr.cpp
    branches/ge_harmony/source/gameengine/Expressions/Value.cpp
    branches/ge_harmony/source/gameengine/Expressions/Value.h
    branches/ge_harmony/source/gameengine/Expressions/VectorValue.cpp
    branches/ge_harmony/source/gameengine/Expressions/VectorValue.h
    branches/ge_harmony/source/gameengine/Expressions/VoidValue.h
    branches/ge_harmony/source/gameengine/GameLogic/SCA_LogicManager.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/bmfont.cpp
    branches/ge_harmony/source/gameengine/Ketsji/BL_Action.cpp
    branches/ge_harmony/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/ge_harmony/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_ArmatureSensor.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_Camera.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_Dome.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_FontObject.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_MeshProxy.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_NavMeshObject.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_NearSensor.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_RayCast.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/ge_harmony/source/gameengine/SceneGraph/SG_IObject.h
    branches/ge_harmony/source/gameengine/VideoTexture/Exception.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/Exception.h
    branches/ge_harmony/source/gameengine/VideoTexture/FilterBase.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/FilterBase.h
    branches/ge_harmony/source/gameengine/VideoTexture/FilterBlueScreen.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/FilterBlueScreen.h
    branches/ge_harmony/source/gameengine/VideoTexture/FilterColor.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/FilterNormal.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/FilterNormal.h
    branches/ge_harmony/source/gameengine/VideoTexture/FilterSource.h
    branches/ge_harmony/source/gameengine/VideoTexture/ImageBase.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/ImageBase.h
    branches/ge_harmony/source/gameengine/VideoTexture/ImageBuff.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/ImageMix.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/ImageMix.h
    branches/ge_harmony/source/gameengine/VideoTexture/ImageRender.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/ImageRender.h
    branches/ge_harmony/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/ImageViewport.h
    branches/ge_harmony/source/gameengine/VideoTexture/PyTypeList.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/Texture.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/Texture.h
    branches/ge_harmony/source/gameengine/VideoTexture/VideoBase.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/VideoBase.h
    branches/ge_harmony/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/VideoFFmpeg.h
    branches/ge_harmony/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/ge_harmony/source/tests/bl_load_addons.py
    branches/ge_harmony/source/tests/pep8.py
    branches/ge_harmony/source/tools/check_style_c.py
    branches/ge_harmony/source/tools/check_style_c_config.py
    branches/ge_harmony/source/tools/spell_check_source_config.py

Added Paths:
-----------
    branches/ge_harmony/doc/python_api/examples/bpy.types.NodeTree.py
    branches/ge_harmony/extern/libmv/libmv/multiview/panography.cc
    branches/ge_harmony/extern/libmv/third_party/ceres/internal/ceres/blas.h
    branches/ge_harmony/intern/audaspace/jack/AUD_JackLibrary.cpp
    branches/ge_harmony/intern/audaspace/jack/AUD_JackLibrary.h
    branches/ge_harmony/intern/cycles/kernel/closure/bssrdf.h
    branches/ge_harmony/intern/cycles/kernel/kernel_subsurface.h
    branches/ge_harmony/intern/cycles/kernel/osl/osl_bssrdf.cpp
    branches/ge_harmony/intern/cycles/kernel/osl/osl_bssrdf.h
    branches/ge_harmony/intern/cycles/kernel/shaders/node_subsurface_scattering.osl
    branches/ge_harmony/intern/cycles/render/bssrdf.cpp
    branches/ge_harmony/intern/cycles/render/bssrdf.h
    branches/ge_harmony/intern/cycles/render/tables.cpp
    branches/ge_harmony/intern/cycles/render/tables.h
    branches/ge_harmony/intern/ghost/intern/GHOST_SizerWin32.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_SizerWin32.h
    branches/ge_harmony/intern/opencolorio/ocio_impl_glsl.cc
    branches/ge_harmony/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
    branches/ge_harmony/release/datafiles/LICENSE-droidsans.ttf.txt
    branches/ge_harmony/release/scripts/freestyle/
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/settings_user.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/utils_rtl.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
    branches/ge_harmony/release/scripts/startup/bl_operators/freestyle.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_freestyle.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_render_layer.py
    branches/ge_harmony/release/scripts/templates_py/custom_nodes.py
    branches/ge_harmony/source/blender/blenkernel/BKE_freestyle.h
    branches/ge_harmony/source/blender/blenkernel/BKE_linestyle.h
    branches/ge_harmony/source/blender/blenkernel/intern/freestyle.c
    branches/ge_harmony/source/blender/blenkernel/intern/linestyle.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_beautify.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_edgeloop_fill.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_edgenet.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_poke.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_bevel.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_extrude.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_inset.c
    branches/ge_harmony/source/blender/freestyle/
    branches/ge_harmony/source/blender/makesdna/DNA_freestyle_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_linestyle_types.h
    branches/ge_harmony/source/blender/makesrna/intern/rna_linestyle.c
    branches/ge_harmony/source/blender/nodes/NOD_common.h
    branches/ge_harmony/source/blender/nodes/NOD_static_types.h
    branches/ge_harmony/source/blender/nodes/composite/node_composite_util.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c

Removed Paths:
-------------
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/callbacks.cc
    branches/ge_harmony/intern/cycles/render/filter.cpp
    branches/ge_harmony/intern/cycles/render/filter.h
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/check_po.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/clean_po.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/languages_menu_utils.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/rtl_utils.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/update_branches.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/update_mo.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/update_msg.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/update_po.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/update_pot.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/update_trunk.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/user_settings.py
    branches/ge_harmony/source/blender/blenkernel/BKE_booleanops_mesh.h
    branches/ge_harmony/source/blender/blenkernel/intern/booleanops_mesh.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree_types.h

Property Changed:
----------------
    branches/ge_harmony/
    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/CMakeLists.txt
    branches/ge_harmony/extern/wcwidth/SConscript
    branches/ge_harmony/extern/wcwidth/wcwidth.c
    branches/ge_harmony/extern/wcwidth/wcwidth.h
    branches/ge_harmony/release/scripts/freestyle/style_modules/
    branches/ge_harmony/release/scripts/presets/interaction/3dsmax.py
    branches/ge_harmony/release/scripts/presets/keyconfig/3dsmax.py
    branches/ge_harmony/source/blender/editors/interface/interface.c
    branches/ge_harmony/source/blender/editors/space_outliner/
    branches/ge_harmony/source/blender/gpu/GPU_simple_shader.h
    branches/ge_harmony/source/blender/gpu/intern/gpu_simple_shader.c


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-55361
   + /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-55932

Modified: branches/ge_harmony/CMakeLists.txt
===================================================================
--- branches/ge_harmony/CMakeLists.txt	2013-04-13 00:43:49 UTC (rev 55999)
+++ branches/ge_harmony/CMakeLists.txt	2013-04-13 03:07:49 UTC (rev 56000)
@@ -124,7 +124,7 @@
 
 option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
 option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
-if (APPLE)
+if(APPLE)
 	option(WITH_PYTHON_FRAMEWORK "Enable building using the Python available in the framework (OSX only)" OFF)
 endif()
 
@@ -229,6 +229,9 @@
 option(WITH_SDL           "Enable SDL for sound and joystick support" ON)
 option(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
 option(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
+if(UNIX AND NOT APPLE)
+	option(WITH_JACK_DYNLOAD  "Enable runtime dynamic Jack libraries loading" OFF)
+endif()
 
 # Compression
 option(WITH_LZO           "Enable fast LZO compression (used for pointcache)" ON)
@@ -237,6 +240,9 @@
 # Camera/motion tracking
 option(WITH_LIBMV         "Enable libmv structure from motion library" ON)
 
+# Freestyle
+option(WITH_FREESTYLE     "Enable Freestyle (advanced edges rendering)" ON)
+
 # Misc
 option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
 option(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON)
@@ -294,9 +300,9 @@
 	endif()
 	
 	execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version
-	if (${MAC_SYS} MATCHES 12)
+	if(${MAC_SYS} MATCHES 12)
 		set(OSX_SYSTEM 10.8)
-	elseif (${MAC_SYS} MATCHES 11)
+	elseif(${MAC_SYS} MATCHES 11)
 		set(OSX_SYSTEM 10.7)
 	elseif(${MAC_SYS} MATCHES 10)
 		set(OSX_SYSTEM 10.6)
@@ -405,11 +411,6 @@
 	set(WITH_HEADLESS ON)
 endif()
 
-# auto enable openimageio for cycles
-if(WITH_CYCLES)
-	set(WITH_OPENIMAGEIO ON)
-endif()
-
 # enable boost for cycles, booleans, audaspace or i18n
 # otherwise if the user disabled
 if(NOT WITH_BOOST)
@@ -428,6 +429,17 @@
 	set(WITH_BOOST OFF)
 endif()
 
+# auto enable openimageio for cycles
+if(WITH_CYCLES)
+	set(WITH_OPENIMAGEIO ON)
+endif()
+
+# auto enable openimageio linking dependencies
+if(WITH_OPENIMAGEIO)
+	set(WITH_IMAGE_OPENEXR ON)
+	set(WITH_IMAGE_TIFF ON)
+endif()
+
 # auto enable llvm for cycles_osl
 if(WITH_CYCLES_OSL)
 	set(WITH_LLVM ON CACHE BOOL "ON" FORCE)
@@ -536,7 +548,7 @@
 
 if(UNIX AND NOT APPLE)
 	macro(find_package_wrapper)
-		STRING(TOUPPER ${ARGV0} _NAME_UPPER)
+		string(TOUPPER ${ARGV0} _NAME_UPPER)
 		if(${WITH_STATIC_LIBS})
 			set(_cmake_find_library_suffixes_back ${CMAKE_FIND_LIBRARY_SUFFIXES})
 			set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
@@ -666,7 +678,7 @@
 		endif()
 	endif()
 
-	if (WITH_INPUT_NDOF)
+	if(WITH_INPUT_NDOF)
 		find_package_wrapper(Spacenav)
 		if(NOT SPACENAV_FOUND)
 			set(WITH_INPUT_NDOF OFF)
@@ -687,10 +699,11 @@
 			endif()
 			set(Boost_USE_MULTITHREADED ON)
 			set(__boost_packages filesystem regex system thread date_time)
-			if (WITH_INTERNATIONAL)
+			if(WITH_INTERNATIONAL)
 				list(APPEND __boost_packages locale)
 			endif()
 			find_package(Boost 1.48 COMPONENTS ${__boost_packages})
+			unset(__boost_packages)
 			if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU)
 				find_package(IcuLinux)
 			endif()
@@ -708,7 +721,7 @@
 
 		set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
 		set(OPENIMAGEIO_LIBPATH)  # TODO, remove and reference the absolute path everywhere
-		set(OPENIMAGEIO_DEFINITIONS)
+		set(OPENIMAGEIO_DEFINITIONS "")
 
 		if(WITH_IMAGE_TIFF)
 			list(APPEND OPENIMAGEIO_LIBRARIES "${TIFF_LIBRARY}")
@@ -899,7 +912,7 @@
 
 	if(CMAKE_COMPILER_IS_GNUCC)
 		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
-		INCLUDE (CheckCSourceCompiles) 
+		include(CheckCSourceCompiles)
 		# Setup 64bit and 64bit windows systems
 		CHECK_C_SOURCE_COMPILES("
 			#ifndef __MINGW64__
@@ -1057,28 +1070,28 @@
 			set(OPENCOLLADA ${LIBDIR}/opencollada)
 
 			set(OPENCOLLADA_INCLUDE_DIRS
-				${LIBDIR}/opencollada/include/COLLADAStreamWriter/include
-				${LIBDIR}/opencollada/include/COLLADABaseUtils/include
-				${LIBDIR}/opencollada/include/COLLADAFramework/include
-				${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
-				${LIBDIR}/opencollada/include/GeneratedSaxParser/include
+				${OPENCOLLADA}/include/opencollada/COLLADAStreamWriter
+				${OPENCOLLADA}/include/opencollada/COLLADABaseUtils
+				${OPENCOLLADA}/include/opencollada/COLLADAFramework
+				${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
+				${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
 			)
 			set_lib_path(OPENCOLLADA_LIBPATH "opencollada")
 
 			set(OPENCOLLADA_LIBRARIES
-				${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADASaxFrameworkLoader.lib
-				${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADAFramework.lib
-				${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADABaseUtils.lib
-				${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADAStreamWriter.lib
-				${OPENCOLLADA_LIBPATH}/lib/MathMLSolver.lib
-				${OPENCOLLADA_LIBPATH}/lib/GeneratedSaxParser.lib
-				${OPENCOLLADA_LIBPATH}/lib/xml2.lib
-				${OPENCOLLADA_LIBPATH}/lib/buffer.lib
-				${OPENCOLLADA_LIBPATH}/lib/ftoa.lib
-				${OPENCOLLADA_LIBPATH}/lib/UTF.lib
+				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
+				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAFramework.lib
+				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADABaseUtils.lib
+				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAStreamWriter.lib
+				${OPENCOLLADA_LIBPATH}/lib/opencollada/MathMLSolver.lib
+				${OPENCOLLADA_LIBPATH}/lib/opencollada/GeneratedSaxParser.lib
+				${OPENCOLLADA_LIBPATH}/lib/opencollada/xml.lib
+				${OPENCOLLADA_LIBPATH}/lib/opencollada/buffer.lib
+				${OPENCOLLADA_LIBPATH}/lib/opencollada/ftoa.lib
+				${OPENCOLLADA_LIBPATH}/lib/opencollada/UTF.lib
 			)
 			set(PCRE_LIBRARIES
-				${OPENCOLLADA_LIBPATH}/lib/pcre.lib
+				${OPENCOLLADA_LIBPATH}/lib/opencollada/pcre.lib
 			)
 			
 			unset(OPENCOLLADA_LIBPATH)
@@ -1135,7 +1148,7 @@
 			endif()
 
 			set_lib_path(PYTHON "python")
-			STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
+			string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
 			# Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
 			set(PYTHON_LIBRARY ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib)
 			# set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
@@ -1279,18 +1292,14 @@
 		if(WITH_OPENCOLLADA)
 			set(OPENCOLLADA ${LIBDIR}/opencollada)
 			set(OPENCOLLADA_INCLUDE_DIRS
-				${LIBDIR}/opencollada/include/COLLADAStreamWriter/include
-				${LIBDIR}/opencollada/include/COLLADABaseUtils/include
-				${LIBDIR}/opencollada/include/COLLADAFramework/include
-				${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
-				${LIBDIR}/opencollada/include/GeneratedSaxParser/include
+				${OPENCOLLADA}/include/opencollada/COLLADAStreamWriter
+				${OPENCOLLADA}/include/opencollada/COLLADABaseUtils
+				${OPENCOLLADA}/include/opencollada/COLLADAFramework
+				${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
+				${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
 			)
-			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
-			if(WITH_MINGW64)
-				set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
-			else()
-				set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
-			endif()
+			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada)
+			set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver buffer ftoa xml)
 			set(PCRE_LIBRARIES pcre)
 		endif()
 
@@ -1377,7 +1386,7 @@
 			set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
 			set(OPENIMAGEIO_LIBRARIES OpenImageIO)
 			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
-			set(OPENIMAGEIO_DEFINITIONS)
+			set(OPENIMAGEIO_DEFINITIONS "")
 		endif()
 		
 		if(WITH_LLVM)
@@ -1403,8 +1412,8 @@
 				LLVMX86Disassembler LLVMX86Info
 				LLVMX86Utils LLVMipa
 				LLVMipo LLVMCore)
-				#imagehelp is needed by LLVM 3.1 on MinGW, check lib\Support\Windows\Signals.inc
-				set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -limagehlp")

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list