[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44837] branches/ge_harmony: Merged revisions 44476-44836 from trunk/blender

Daniel Stokes kupomail at gmail.com
Mon Mar 12 19:53:32 CET 2012


Revision: 44837
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44837
Author:   kupoman
Date:     2012-03-12 18:53:22 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
Merged revisions 44476-44836 from trunk/blender

Modified Paths:
--------------
    branches/ge_harmony/CMakeLists.txt
    branches/ge_harmony/GNUmakefile
    branches/ge_harmony/SConstruct
    branches/ge_harmony/doc/doxygen/Doxyfile
    branches/ge_harmony/doc/doxygen/doxygen.source
    branches/ge_harmony/doc/python_api/rst/bge.types.rst
    branches/ge_harmony/doc/python_api/rst/info_best_practice.rst
    branches/ge_harmony/doc/python_api/rst/info_tips_and_tricks.rst
    branches/ge_harmony/doc/python_api/sphinx_doc_gen.py
    branches/ge_harmony/extern/libmv/CMakeLists.txt
    branches/ge_harmony/extern/libmv/ChangeLog
    branches/ge_harmony/extern/libmv/bundle.sh
    branches/ge_harmony/extern/libmv/files.txt
    branches/ge_harmony/extern/libmv/libmv/logging/logging.h
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/ge_harmony/extern/libmv/libmv-capi.cpp
    branches/ge_harmony/extern/libmv/patches/series
    branches/ge_harmony/extern/libmv/third_party/gflags/README.libmv
    branches/ge_harmony/extern/libmv/third_party/gflags/config.h
    branches/ge_harmony/extern/libmv/third_party/gflags/gflags/gflags.h
    branches/ge_harmony/extern/libmv/third_party/gflags/gflags.cc
    branches/ge_harmony/extern/libmv/third_party/gflags/gflags_completions.cc
    branches/ge_harmony/extern/libmv/third_party/gflags/gflags_reporting.cc
    branches/ge_harmony/extern/libmv/third_party/gflags/mutex.h
    branches/ge_harmony/extern/libmv/third_party/glog/ChangeLog
    branches/ge_harmony/extern/libmv/third_party/glog/README.libmv
    branches/ge_harmony/extern/libmv/third_party/glog/src/base/commandlineflags.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/base/googleinit.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/config_freebsd.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/config_linux.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/config_mac.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/demangle.cc
    branches/ge_harmony/extern/libmv/third_party/glog/src/glog/log_severity.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/glog/logging.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/glog/raw_logging.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/logging.cc
    branches/ge_harmony/extern/libmv/third_party/glog/src/raw_logging.cc
    branches/ge_harmony/extern/libmv/third_party/glog/src/signalhandler.cc
    branches/ge_harmony/extern/libmv/third_party/glog/src/stacktrace_libunwind-inl.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/symbolize.cc
    branches/ge_harmony/extern/libmv/third_party/glog/src/symbolize.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/utilities.cc
    branches/ge_harmony/extern/libmv/third_party/glog/src/utilities.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/vlog_is_on.cc
    branches/ge_harmony/extern/libmv/third_party/glog/src/windows/glog/log_severity.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/windows/glog/logging.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/windows/glog/raw_logging.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/windows/port.h
    branches/ge_harmony/extern/recastnavigation/Detour/Source/DetourStatNavMesh.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_CarveInterface.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_MathUtils.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_Merge2.cpp
    branches/ge_harmony/intern/bsp/intern/BSP_CSGMesh.h
    branches/ge_harmony/intern/container/CTR_List.h
    branches/ge_harmony/intern/cycles/app/cycles_xml.cpp
    branches/ge_harmony/intern/cycles/blender/addon/__init__.py
    branches/ge_harmony/intern/cycles/blender/addon/enums.py
    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_object.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_sync.h
    branches/ge_harmony/intern/cycles/kernel/kernel.cpp
    branches/ge_harmony/intern/cycles/kernel/kernel_accumulate.h
    branches/ge_harmony/intern/cycles/kernel/kernel_camera.h
    branches/ge_harmony/intern/cycles/kernel/kernel_displace.h
    branches/ge_harmony/intern/cycles/kernel/kernel_light.h
    branches/ge_harmony/intern/cycles/kernel/kernel_montecarlo.h
    branches/ge_harmony/intern/cycles/kernel/kernel_passes.h
    branches/ge_harmony/intern/cycles/kernel/kernel_path.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/svm/svm_image.h
    branches/ge_harmony/intern/cycles/render/attribute.cpp
    branches/ge_harmony/intern/cycles/render/attribute.h
    branches/ge_harmony/intern/cycles/render/background.cpp
    branches/ge_harmony/intern/cycles/render/background.h
    branches/ge_harmony/intern/cycles/render/camera.cpp
    branches/ge_harmony/intern/cycles/render/camera.h
    branches/ge_harmony/intern/cycles/render/film.cpp
    branches/ge_harmony/intern/cycles/render/image.cpp
    branches/ge_harmony/intern/cycles/render/image.h
    branches/ge_harmony/intern/cycles/render/integrator.cpp
    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/scene.cpp
    branches/ge_harmony/intern/cycles/render/scene.h
    branches/ge_harmony/intern/cycles/render/shader.cpp
    branches/ge_harmony/intern/cycles/render/svm.cpp
    branches/ge_harmony/intern/cycles/render/svm.h
    branches/ge_harmony/intern/cycles/util/util_opencl.cpp
    branches/ge_harmony/intern/decimation/intern/LOD_ExternNormalEditor.h
    branches/ge_harmony/intern/decimation/intern/LOD_FaceNormalEditor.h
    branches/ge_harmony/intern/decimation/intern/LOD_ManMesh2.h
    branches/ge_harmony/intern/decimation/intern/LOD_MeshPrimitives.h
    branches/ge_harmony/intern/decimation/intern/future/LOD_ExternVColorEditor.h
    branches/ge_harmony/intern/decimation/intern/future/LOD_NdQuadric.h
    branches/ge_harmony/intern/decimation/intern/future/LOD_NdQuadricEditor.cpp
    branches/ge_harmony/intern/decimation/intern/future/LOD_NdQuadricEditor.h
    branches/ge_harmony/intern/ghost/GHOST_C-api.h
    branches/ge_harmony/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemPathsX11.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemX11.h
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowSDL.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowX11.h
    branches/ge_harmony/intern/guardedalloc/test/simpletest/memtest.c
    branches/ge_harmony/release/scripts/modules/bpy_extras/io_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/sys_info.py
    branches/ge_harmony/release/scripts/presets/keyconfig/maya.py
    branches/ge_harmony/release/scripts/startup/bl_operators/anim.py
    branches/ge_harmony/release/scripts/startup/bl_operators/image.py
    branches/ge_harmony/release/scripts/startup/bl_operators/object.py
    branches/ge_harmony/release/scripts/startup/bl_operators/uvcalc_follow_active.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/properties_data_camera.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_game.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_scene.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_world.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_clip.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_sequencer.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/ge_harmony/release/scripts/startup/keyingsets_builtins.py
    branches/ge_harmony/source/blender/avi/AVI_avi.h
    branches/ge_harmony/source/blender/avi/intern/avi.c
    branches/ge_harmony/source/blender/blenfont/BLF_api.h
    branches/ge_harmony/source/blender/blenfont/BLF_translation.h
    branches/ge_harmony/source/blender/blenfont/intern/blf.c
    branches/ge_harmony/source/blender/blenfont/intern/blf_dir.c
    branches/ge_harmony/source/blender/blenfont/intern/blf_font.c
    branches/ge_harmony/source/blender/blenfont/intern/blf_glyph.c
    branches/ge_harmony/source/blender/blenfont/intern/blf_internal.h
    branches/ge_harmony/source/blender/blenfont/intern/blf_lang.c
    branches/ge_harmony/source/blender/blenfont/intern/blf_translation.c
    branches/ge_harmony/source/blender/blenfont/intern/blf_util.c
    branches/ge_harmony/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_animsys.h
    branches/ge_harmony/source/blender/blenkernel/BKE_armature.h
    branches/ge_harmony/source/blender/blenkernel/BKE_blender.h
    branches/ge_harmony/source/blender/blenkernel/BKE_bmesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_bmfont_types.h
    branches/ge_harmony/source/blender/blenkernel/BKE_brush.h
    branches/ge_harmony/source/blender/blenkernel/BKE_bvhutils.h
    branches/ge_harmony/source/blender/blenkernel/BKE_cdderivedmesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_cloth.h
    branches/ge_harmony/source/blender/blenkernel/BKE_collision.h
    branches/ge_harmony/source/blender/blenkernel/BKE_context.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_depsgraph.h
    branches/ge_harmony/source/blender/blenkernel/BKE_dynamicpaint.h
    branches/ge_harmony/source/blender/blenkernel/BKE_effect.h
    branches/ge_harmony/source/blender/blenkernel/BKE_fcurve.h
    branches/ge_harmony/source/blender/blenkernel/BKE_icons.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_material.h
    branches/ge_harmony/source/blender/blenkernel/BKE_mball.h
    branches/ge_harmony/source/blender/blenkernel/BKE_mesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_modifier.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_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_pointcache.h
    branches/ge_harmony/source/blender/blenkernel/BKE_report.h
    branches/ge_harmony/source/blender/blenkernel/BKE_screen.h
    branches/ge_harmony/source/blender/blenkernel/BKE_sequencer.h
    branches/ge_harmony/source/blender/blenkernel/BKE_sketch.h
    branches/ge_harmony/source/blender/blenkernel/BKE_subsurf.h
    branches/ge_harmony/source/blender/blenkernel/BKE_suggestions.h
    branches/ge_harmony/source/blender/blenkernel/BKE_tessmesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_text.h
    branches/ge_harmony/source/blender/blenkernel/BKE_tracking.h
    branches/ge_harmony/source/blender/blenkernel/CMakeLists.txt
    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/CCGSubSurf.h
    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/armature.c
    branches/ge_harmony/source/blender/blenkernel/intern/boids.c
    branches/ge_harmony/source/blender/blenkernel/intern/booleanops_mesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/brush.c
    branches/ge_harmony/source/blender/blenkernel/intern/bvhutils.c
    branches/ge_harmony/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/cloth.c
    branches/ge_harmony/source/blender/blenkernel/intern/collision.c
    branches/ge_harmony/source/blender/blenkernel/intern/colortools.c
    branches/ge_harmony/source/blender/blenkernel/intern/constraint.c
    branches/ge_harmony/source/blender/blenkernel/intern/curve.c
    branches/ge_harmony/source/blender/blenkernel/intern/customdata.c
    branches/ge_harmony/source/blender/blenkernel/intern/customdata_file.c
    branches/ge_harmony/source/blender/blenkernel/intern/deform.c
    branches/ge_harmony/source/blender/blenkernel/intern/depsgraph.c
    branches/ge_harmony/source/blender/blenkernel/intern/displist.c
    branches/ge_harmony/source/blender/blenkernel/intern/dynamicpaint.c
    branches/ge_harmony/source/blender/blenkernel/intern/editderivedmesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/effect.c
    branches/ge_harmony/source/blender/blenkernel/intern/fcurve.c
    branches/ge_harmony/source/blender/blenkernel/intern/fmodifier.c
    branches/ge_harmony/source/blender/blenkernel/intern/font.c
    branches/ge_harmony/source/blender/blenkernel/intern/group.c
    branches/ge_harmony/source/blender/blenkernel/intern/icons.c
    branches/ge_harmony/source/blender/blenkernel/intern/idprop.c
    branches/ge_harmony/source/blender/blenkernel/intern/image.c
    branches/ge_harmony/source/blender/blenkernel/intern/image_gen.c
    branches/ge_harmony/source/blender/blenkernel/intern/implicit.c
    branches/ge_harmony/source/blender/blenkernel/intern/ipo.c
    branches/ge_harmony/source/blender/blenkernel/intern/key.c
    branches/ge_harmony/source/blender/blenkernel/intern/lamp.c
    branches/ge_harmony/source/blender/blenkernel/intern/lattice.c
    branches/ge_harmony/source/blender/blenkernel/intern/library.c
    branches/ge_harmony/source/blender/blenkernel/intern/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/modifiers_bmesh.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/navmesh_conversion.c
    branches/ge_harmony/source/blender/blenkernel/intern/nla.c
    branches/ge_harmony/source/blender/blenkernel/intern/node.c
    branches/ge_harmony/source/blender/blenkernel/intern/object.c
    branches/ge_harmony/source/blender/blenkernel/intern/ocean.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/pointcache.c
    branches/ge_harmony/source/blender/blenkernel/intern/property.c
    branches/ge_harmony/source/blender/blenkernel/intern/report.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/screen.c
    branches/ge_harmony/source/blender/blenkernel/intern/script.c
    branches/ge_harmony/source/blender/blenkernel/intern/seqeffects.c
    branches/ge_harmony/source/blender/blenkernel/intern/sequencer.c
    branches/ge_harmony/source/blender/blenkernel/intern/shrinkwrap.c
    branches/ge_harmony/source/blender/blenkernel/intern/sketch.c
    branches/ge_harmony/source/blender/blenkernel/intern/smoke.c
    branches/ge_harmony/source/blender/blenkernel/intern/softbody.c
    branches/ge_harmony/source/blender/blenkernel/intern/sound.c
    branches/ge_harmony/source/blender/blenkernel/intern/speaker.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/world.c
    branches/ge_harmony/source/blender/blenkernel/intern/writeavi.c
    branches/ge_harmony/source/blender/blenkernel/intern/writeffmpeg.c
    branches/ge_harmony/source/blender/blenlib/BLI_array.h
    branches/ge_harmony/source/blender/blenlib/BLI_bitmap.h
    branches/ge_harmony/source/blender/blenlib/BLI_blenlib.h
    branches/ge_harmony/source/blender/blenlib/BLI_bpath.h
    branches/ge_harmony/source/blender/blenlib/BLI_callbacks.h
    branches/ge_harmony/source/blender/blenlib/BLI_dlrbTree.h
    branches/ge_harmony/source/blender/blenlib/BLI_dynstr.h
    branches/ge_harmony/source/blender/blenlib/BLI_editVert.h
    branches/ge_harmony/source/blender/blenlib/BLI_fnmatch.h
    branches/ge_harmony/source/blender/blenlib/BLI_ghash.h
    branches/ge_harmony/source/blender/blenlib/BLI_graph.h
    branches/ge_harmony/source/blender/blenlib/BLI_gsqueue.h
    branches/ge_harmony/source/blender/blenlib/BLI_heap.h
    branches/ge_harmony/source/blender/blenlib/BLI_kdtree.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_matrix.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_vector.h
    branches/ge_harmony/source/blender/blenlib/BLI_md5.h
    branches/ge_harmony/source/blender/blenlib/BLI_mempool.h
    branches/ge_harmony/source/blender/blenlib/BLI_path_util.h
    branches/ge_harmony/source/blender/blenlib/BLI_pbvh.h
    branches/ge_harmony/source/blender/blenlib/BLI_rand.h
    branches/ge_harmony/source/blender/blenlib/BLI_rect.h
    branches/ge_harmony/source/blender/blenlib/BLI_scanfill.h
    branches/ge_harmony/source/blender/blenlib/BLI_string.h
    branches/ge_harmony/source/blender/blenlib/BLI_utildefines.h
    branches/ge_harmony/source/blender/blenlib/BLI_vfontdata.h
    branches/ge_harmony/source/blender/blenlib/CMakeLists.txt
    branches/ge_harmony/source/blender/blenlib/PIL_time.h
    branches/ge_harmony/source/blender/blenlib/intern/BLI_args.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_ghash.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_heap.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_kdtree.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_memarena.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_mempool.c
    branches/ge_harmony/source/blender/blenlib/intern/DLRB_tree.c
    branches/ge_harmony/source/blender/blenlib/intern/boxpack2d.c
    branches/ge_harmony/source/blender/blenlib/intern/bpath.c
    branches/ge_harmony/source/blender/blenlib/intern/edgehash.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/jitter.c
    branches/ge_harmony/source/blender/blenlib/intern/listbase.c
    branches/ge_harmony/source/blender/blenlib/intern/math_base_inline.c
    branches/ge_harmony/source/blender/blenlib/intern/math_color.c
    branches/ge_harmony/source/blender/blenlib/intern/math_color_inline.c
    branches/ge_harmony/source/blender/blenlib/intern/math_geom.c
    branches/ge_harmony/source/blender/blenlib/intern/math_matrix.c
    branches/ge_harmony/source/blender/blenlib/intern/math_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/md5.c
    branches/ge_harmony/source/blender/blenlib/intern/noise.c
    branches/ge_harmony/source/blender/blenlib/intern/path_util.c
    branches/ge_harmony/source/blender/blenlib/intern/pbvh.c
    branches/ge_harmony/source/blender/blenlib/intern/scanfill.c
    branches/ge_harmony/source/blender/blenlib/intern/storage.c
    branches/ge_harmony/source/blender/blenlib/intern/string.c
    branches/ge_harmony/source/blender/blenlib/intern/string_utf8.c
    branches/ge_harmony/source/blender/blenlib/intern/threads.c
    branches/ge_harmony/source/blender/blenlib/intern/uvproject.c
    branches/ge_harmony/source/blender/blenlib/intern/voxel.c
    branches/ge_harmony/source/blender/blenlib/intern/winstuff.c
    branches/ge_harmony/source/blender/blenloader/BLO_readfile.h
    branches/ge_harmony/source/blender/blenloader/BLO_sys_types.h
    branches/ge_harmony/source/blender/blenloader/BLO_writefile.h
    branches/ge_harmony/source/blender/blenloader/intern/readfile.c
    branches/ge_harmony/source/blender/blenloader/intern/writefile.c
    branches/ge_harmony/source/blender/blenpluginapi/documentation.h
    branches/ge_harmony/source/blender/blenpluginapi/iff.h
    branches/ge_harmony/source/blender/blenpluginapi/intern/pluginapi.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/bmesh_class.h
    branches/ge_harmony/source/blender/bmesh/bmesh_error.h
    branches/ge_harmony/source/blender/bmesh/bmesh_operator_api.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_construct.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_inline.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_interp.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators_inline.c
    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_mods.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operator_api_inline.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operators.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_polygon.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_private.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_queries.c
    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/intern/bmesh_walkers.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_walkers_private.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_edgesplit.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_extrude.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_subdivide.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_subdivide.h
    branches/ge_harmony/source/blender/bmesh/operators/bmo_triangulate.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_utils.c
    branches/ge_harmony/source/blender/bmesh/tools/BME_bevel.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/ArmatureImporter.cpp
    branches/ge_harmony/source/blender/collada/DocumentImporter.cpp
    branches/ge_harmony/source/blender/collada/DocumentImporter.h
    branches/ge_harmony/source/blender/collada/ExtraHandler.h
    branches/ge_harmony/source/blender/collada/ExtraTags.h
    branches/ge_harmony/source/blender/collada/MeshImporter.cpp
    branches/ge_harmony/source/blender/collada/TransformWriter.cpp
    branches/ge_harmony/source/blender/collada/collada_internal.cpp
    branches/ge_harmony/source/blender/editors/animation/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/animation/SConscript
    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_deps.c
    branches/ge_harmony/source/blender/editors/animation/anim_draw.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/drivers.c
    branches/ge_harmony/source/blender/editors/animation/fmodifier_ui.c
    branches/ge_harmony/source/blender/editors/animation/keyframes_draw.c
    branches/ge_harmony/source/blender/editors/animation/keyframes_edit.c
    branches/ge_harmony/source/blender/editors/animation/keyframes_general.c
    branches/ge_harmony/source/blender/editors/animation/keyframing.c
    branches/ge_harmony/source/blender/editors/animation/keyingsets.c
    branches/ge_harmony/source/blender/editors/armature/armature_ops.c
    branches/ge_harmony/source/blender/editors/armature/editarmature.c
    branches/ge_harmony/source/blender/editors/armature/editarmature_generate.c
    branches/ge_harmony/source/blender/editors/armature/editarmature_retarget.c
    branches/ge_harmony/source/blender/editors/armature/editarmature_sketch.c
    branches/ge_harmony/source/blender/editors/armature/meshlaplacian.c
    branches/ge_harmony/source/blender/editors/armature/meshlaplacian.h
    branches/ge_harmony/source/blender/editors/armature/poseSlide.c
    branches/ge_harmony/source/blender/editors/armature/poselib.c
    branches/ge_harmony/source/blender/editors/armature/poseobject.c
    branches/ge_harmony/source/blender/editors/armature/reeb.c
    branches/ge_harmony/source/blender/editors/armature/reeb.h
    branches/ge_harmony/source/blender/editors/curve/curve_intern.h
    branches/ge_harmony/source/blender/editors/curve/editcurve.c
    branches/ge_harmony/source/blender/editors/datafiles/startup.blend.c
    branches/ge_harmony/source/blender/editors/gpencil/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/gpencil/SConscript
    branches/ge_harmony/source/blender/editors/gpencil/drawgpencil.c
    branches/ge_harmony/source/blender/editors/gpencil/editaction_gpencil.c
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_buttons.c
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_paint.c
    branches/ge_harmony/source/blender/editors/include/BIF_gl.h
    branches/ge_harmony/source/blender/editors/include/BIF_glutil.h
    branches/ge_harmony/source/blender/editors/include/ED_anim_api.h
    branches/ge_harmony/source/blender/editors/include/ED_armature.h
    branches/ge_harmony/source/blender/editors/include/ED_curve.h
    branches/ge_harmony/source/blender/editors/include/ED_datafiles.h
    branches/ge_harmony/source/blender/editors/include/ED_gpencil.h
    branches/ge_harmony/source/blender/editors/include/ED_keyframing.h
    branches/ge_harmony/source/blender/editors/include/ED_mesh.h
    branches/ge_harmony/source/blender/editors/include/ED_numinput.h
    branches/ge_harmony/source/blender/editors/include/ED_render.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_uvedit.h
    branches/ge_harmony/source/blender/editors/include/ED_view3d.h
    branches/ge_harmony/source/blender/editors/include/UI_interface.h
    branches/ge_harmony/source/blender/editors/include/UI_interface_icons.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_style.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/interface/view2d_ops.c
    branches/ge_harmony/source/blender/editors/mesh/bmesh_select.c
    branches/ge_harmony/source/blender/editors/mesh/bmesh_selecthistory.c
    branches/ge_harmony/source/blender/editors/mesh/bmesh_tools.c
    branches/ge_harmony/source/blender/editors/mesh/bmesh_utils.c
    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/knifetool.c
    branches/ge_harmony/source/blender/editors/mesh/loopcut.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_hook.c
    branches/ge_harmony/source/blender/editors/object/object_intern.h
    branches/ge_harmony/source/blender/editors/object/object_modifier.c
    branches/ge_harmony/source/blender/editors/object/object_ops.c
    branches/ge_harmony/source/blender/editors/object/object_relations.c
    branches/ge_harmony/source/blender/editors/object/object_select.c
    branches/ge_harmony/source/blender/editors/object/object_shapekey.c
    branches/ge_harmony/source/blender/editors/object/object_transform.c
    branches/ge_harmony/source/blender/editors/object/object_vgroup.c
    branches/ge_harmony/source/blender/editors/physics/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/render/render_internal.c
    branches/ge_harmony/source/blender/editors/render/render_opengl.c
    branches/ge_harmony/source/blender/editors/render/render_preview.c
    branches/ge_harmony/source/blender/editors/render/render_shading.c
    branches/ge_harmony/source/blender/editors/render/render_update.c
    branches/ge_harmony/source/blender/editors/render/render_view.c
    branches/ge_harmony/source/blender/editors/screen/area.c
    branches/ge_harmony/source/blender/editors/screen/glutil.c
    branches/ge_harmony/source/blender/editors/screen/screen_edit.c
    branches/ge_harmony/source/blender/editors/screen/screen_ops.c
    branches/ge_harmony/source/blender/editors/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_intern.h
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_utils.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/ge_harmony/source/blender/editors/sound/sound_ops.c
    branches/ge_harmony/source/blender/editors/space_action/action_draw.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_action/space_action.c
    branches/ge_harmony/source/blender/editors/space_api/spacetypes.c
    branches/ge_harmony/source/blender/editors/space_buttons/buttons_context.c
    branches/ge_harmony/source/blender/editors/space_buttons/buttons_texture.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_draw.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_graph_draw.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_graph_ops.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_intern.h
    branches/ge_harmony/source/blender/editors/space_clip/clip_ops.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_toolbar.c
    branches/ge_harmony/source/blender/editors/space_clip/space_clip.c
    branches/ge_harmony/source/blender/editors/space_clip/tracking_ops.c
    branches/ge_harmony/source/blender/editors/space_console/console_intern.h
    branches/ge_harmony/source/blender/editors/space_console/console_ops.c
    branches/ge_harmony/source/blender/editors/space_console/space_console.c
    branches/ge_harmony/source/blender/editors/space_file/file_draw.c
    branches/ge_harmony/source/blender/editors/space_file/file_intern.h
    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/filesel.c
    branches/ge_harmony/source/blender/editors/space_file/fsmenu.c
    branches/ge_harmony/source/blender/editors/space_file/fsmenu.h
    branches/ge_harmony/source/blender/editors/space_file/space_file.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_buttons.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_draw.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_edit.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_intern.h
    branches/ge_harmony/source/blender/editors/space_graph/graph_select.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_utils.c
    branches/ge_harmony/source/blender/editors/space_graph/space_graph.c
    branches/ge_harmony/source/blender/editors/space_image/image_buttons.c
    branches/ge_harmony/source/blender/editors/space_image/image_draw.c
    branches/ge_harmony/source/blender/editors/space_image/image_intern.h
    branches/ge_harmony/source/blender/editors/space_image/image_ops.c
    branches/ge_harmony/source/blender/editors/space_image/space_image.c
    branches/ge_harmony/source/blender/editors/space_info/info_ops.c
    branches/ge_harmony/source/blender/editors/space_info/info_report.c
    branches/ge_harmony/source/blender/editors/space_info/info_stats.c
    branches/ge_harmony/source/blender/editors/space_logic/logic_ops.c
    branches/ge_harmony/source/blender/editors/space_logic/logic_window.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_draw.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_edit.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_select.c
    branches/ge_harmony/source/blender/editors/space_nla/space_nla.c
    branches/ge_harmony/source/blender/editors/space_node/drawnode.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_intern.h
    branches/ge_harmony/source/blender/editors/space_node/node_ops.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/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/outliner_tree.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_add.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_select.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_draw.c
    branches/ge_harmony/source/blender/editors/space_text/text_ops.c
    branches/ge_harmony/source/blender/editors/space_text/text_python.c
    branches/ge_harmony/source/blender/editors/space_view3d/drawanimviz.c
    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_select.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_snap.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_view.c
    branches/ge_harmony/source/blender/editors/transform/transform.c
    branches/ge_harmony/source/blender/editors/transform/transform.h
    branches/ge_harmony/source/blender/editors/transform/transform_constraints.c
    branches/ge_harmony/source/blender/editors/transform/transform_conversions.c
    branches/ge_harmony/source/blender/editors/transform/transform_generics.c
    branches/ge_harmony/source/blender/editors/transform/transform_input.c
    branches/ge_harmony/source/blender/editors/transform/transform_manipulator.c
    branches/ge_harmony/source/blender/editors/transform/transform_ops.c
    branches/ge_harmony/source/blender/editors/transform/transform_orientations.c
    branches/ge_harmony/source/blender/editors/transform/transform_snap.c
    branches/ge_harmony/source/blender/editors/util/crazyspace.c
    branches/ge_harmony/source/blender/editors/util/ed_util.c
    branches/ge_harmony/source/blender/editors/util/editmode_undo.c
    branches/ge_harmony/source/blender/editors/util/numinput.c
    branches/ge_harmony/source/blender/editors/util/undo.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_buttons.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_draw.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_intern.h
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_ops.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_parametrizer.h
    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_buffers.h
    branches/ge_harmony/source/blender/gpu/GPU_extensions.h
    branches/ge_harmony/source/blender/gpu/GPU_material.h
    branches/ge_harmony/source/blender/gpu/intern/gpu_buffers.c
    branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.c
    branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.h
    branches/ge_harmony/source/blender/gpu/intern/gpu_draw.c
    branches/ge_harmony/source/blender/gpu/intern/gpu_extensions.c
    branches/ge_harmony/source/blender/gpu/intern/gpu_material.c
    branches/ge_harmony/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/ge_harmony/source/blender/gpu/shaders/gpu_shader_material.glsl.c
    branches/ge_harmony/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/ge_harmony/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/ge_harmony/source/blender/imbuf/CMakeLists.txt
    branches/ge_harmony/source/blender/imbuf/IMB_imbuf.h
    branches/ge_harmony/source/blender/imbuf/IMB_imbuf_types.h
    branches/ge_harmony/source/blender/imbuf/IMB_moviecache.h
    branches/ge_harmony/source/blender/imbuf/SConscript
    branches/ge_harmony/source/blender/imbuf/intern/IMB_allocimbuf.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/IMB_metadata.h
    branches/ge_harmony/source/blender/imbuf/intern/anim_movie.c
    branches/ge_harmony/source/blender/imbuf/intern/bmp.c
    branches/ge_harmony/source/blender/imbuf/intern/cache.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/cineonlib.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/cineonlib.h
    branches/ge_harmony/source/blender/imbuf/intern/cineon/logImageLib.h
    branches/ge_harmony/source/blender/imbuf/intern/cineon/logmemfile.c
    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/filter.c
    branches/ge_harmony/source/blender/imbuf/intern/imageprocess.c
    branches/ge_harmony/source/blender/imbuf/intern/imbuf_cocoa.m
    branches/ge_harmony/source/blender/imbuf/intern/indexer.c
    branches/ge_harmony/source/blender/imbuf/intern/jp2.c
    branches/ge_harmony/source/blender/imbuf/intern/jpeg.c
    branches/ge_harmony/source/blender/imbuf/intern/metadata.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/openexr/openexr_api.h
    branches/ge_harmony/source/blender/imbuf/intern/openexr/openexr_multi.h
    branches/ge_harmony/source/blender/imbuf/intern/png.c
    branches/ge_harmony/source/blender/imbuf/intern/radiance_hdr.c
    branches/ge_harmony/source/blender/imbuf/intern/rectop.c
    branches/ge_harmony/source/blender/imbuf/intern/scaling.c
    branches/ge_harmony/source/blender/imbuf/intern/thumbs.c
    branches/ge_harmony/source/blender/imbuf/intern/thumbs_blend.c
    branches/ge_harmony/source/blender/imbuf/intern/tiff.c
    branches/ge_harmony/source/blender/imbuf/intern/util.c
    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_actuator_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_anim_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_armature_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_brush_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_camera_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_cloth_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_curve_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_customdata_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_documentation.h
    branches/ge_harmony/source/blender/makesdna/DNA_dynamicpaint_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_fileglobal_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_meta_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_modifier_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_movieclip_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_node_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_object_force.h
    branches/ge_harmony/source/blender/makesdna/DNA_object_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_scene_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_sdna_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_smoke_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_sound_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_tracking_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_userdef_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_view3d_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_windowmanager_types.h
    branches/ge_harmony/source/blender/makesdna/intern/dna_genfile.c
    branches/ge_harmony/source/blender/makesdna/intern/makesdna.c
    branches/ge_harmony/source/blender/makesrna/RNA_access.h
    branches/ge_harmony/source/blender/makesrna/RNA_define.h
    branches/ge_harmony/source/blender/makesrna/RNA_types.h
    branches/ge_harmony/source/blender/makesrna/intern/CMakeLists.txt
    branches/ge_harmony/source/blender/makesrna/intern/makesrna.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_ID.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_access.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_action.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_actuator.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_actuator_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_animation.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_animation_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_animviz.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_armature.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_armature_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_boid.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_brush.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_camera.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_camera_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_cloth.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_color.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_constraint.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_context.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_controller.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_controller_api.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_fcurve.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_fcurve_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_fluidsim.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_gpencil.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_group.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_image.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_image_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_internal.h
    branches/ge_harmony/source/blender/makesrna/intern/rna_key.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_lamp.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_lattice.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_main.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_main_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_material.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_material_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_mesh.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_mesh_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_mesh_utils.h
    branches/ge_harmony/source/blender/makesrna/intern/rna_meta.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_modifier.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_movieclip.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_nla.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree_types.h
    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_object_force.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_packedfile.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_particle.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_pose.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_pose_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_property.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_render.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_rna.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_scene.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_scene_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_screen.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sensor.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sensor_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sequencer.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_smoke.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sound.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_space.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_speaker.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_test.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_text.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_text_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_texture.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_texture_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_timeline.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_tracking.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_ui.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_ui_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_userdef.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_vfont.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_wm.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_wm_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_world.c
    branches/ge_harmony/source/blender/modifiers/MOD_modifiertypes.h
    branches/ge_harmony/source/blender/modifiers/intern/MOD_array.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_bevel.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_boolean.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_boolean_util.h
    branches/ge_harmony/source/blender/modifiers/intern/MOD_build.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_cast.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_cloth.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_collision.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_displace.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_dynamicpaint.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_explode.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_fluidsim.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_mask.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_mirror.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_multires.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_particlesystem.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_remesh.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_screw.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_smoke.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_smooth.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_solidify.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_surface.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_util.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_util.h
    branches/ge_harmony/source/blender/modifiers/intern/MOD_uvproject.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_weightvg_util.h
    branches/ge_harmony/source/blender/nodes/CMakeLists.txt
    branches/ge_harmony/source/blender/nodes/NOD_composite.h
    branches/ge_harmony/source/blender/nodes/composite/node_composite_tree.c
    branches/ge_harmony/source/blender/nodes/composite/node_composite_util.c
    branches/ge_harmony/source/blender/nodes/composite/node_composite_util.h
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/ge_harmony/source/blender/nodes/intern/node_exec.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_dynamic.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_normal.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_squeeze.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_image.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_output.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_viewer.c
    branches/ge_harmony/source/blender/python/bmesh/CMakeLists.txt
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_api.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types.h
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_utils.c
    branches/ge_harmony/source/blender/python/generic/bgl.h
    branches/ge_harmony/source/blender/python/generic/bpy_internal_import.c
    branches/ge_harmony/source/blender/python/generic/idprop_py_api.c
    branches/ge_harmony/source/blender/python/generic/py_capi_utils.c
    branches/ge_harmony/source/blender/python/intern/bpy.c
    branches/ge_harmony/source/blender/python/intern/bpy_app.c
    branches/ge_harmony/source/blender/python/intern/bpy_app_handlers.c
    branches/ge_harmony/source/blender/python/intern/bpy_app_handlers.h
    branches/ge_harmony/source/blender/python/intern/bpy_interface.c
    branches/ge_harmony/source/blender/python/intern/bpy_interface_atexit.c
    branches/ge_harmony/source/blender/python/intern/bpy_operator.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_array.c
    branches/ge_harmony/source/blender/python/intern/bpy_traceback.c
    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_Color.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Color.h
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Euler.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Euler.h
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Matrix.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Quaternion.h
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Vector.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_geometry.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_noise.c
    branches/ge_harmony/source/blender/quicktime/apple/quicktime_export.c
    branches/ge_harmony/source/blender/quicktime/quicktime_export.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_pipeline.h
    branches/ge_harmony/source/blender/render/intern/include/gammaCorrectionTables.h
    branches/ge_harmony/source/blender/render/intern/include/initrender.h
    branches/ge_harmony/source/blender/render/intern/include/pixelblending.h
    branches/ge_harmony/source/blender/render/intern/include/pixelshading.h
    branches/ge_harmony/source/blender/render/intern/include/rayintersection.h
    branches/ge_harmony/source/blender/render/intern/include/rayobject.h
    branches/ge_harmony/source/blender/render/intern/include/render_types.h
    branches/ge_harmony/source/blender/render/intern/include/rendercore.h
    branches/ge_harmony/source/blender/render/intern/include/renderdatabase.h
    branches/ge_harmony/source/blender/render/intern/include/shadbuf.h
    branches/ge_harmony/source/blender/render/intern/include/shading.h
    branches/ge_harmony/source/blender/render/intern/include/strand.h
    branches/ge_harmony/source/blender/render/intern/include/sunsky.h
    branches/ge_harmony/source/blender/render/intern/include/texture_ocean.h
    branches/ge_harmony/source/blender/render/intern/include/voxeldata.h
    branches/ge_harmony/source/blender/render/intern/raytrace/bvh.h
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_hint.h
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_internal.h
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/reorganize.h
    branches/ge_harmony/source/blender/render/intern/raytrace/vbvh.h
    branches/ge_harmony/source/blender/render/intern/source/convertblender.c
    branches/ge_harmony/source/blender/render/intern/source/envmap.c
    branches/ge_harmony/source/blender/render/intern/source/external_engine.c
    branches/ge_harmony/source/blender/render/intern/source/gammaCorrectionTables.c
    branches/ge_harmony/source/blender/render/intern/source/imagetexture.c
    branches/ge_harmony/source/blender/render/intern/source/occlusion.c
    branches/ge_harmony/source/blender/render/intern/source/pipeline.c
    branches/ge_harmony/source/blender/render/intern/source/pixelblending.c
    branches/ge_harmony/source/blender/render/intern/source/pixelshading.c
    branches/ge_harmony/source/blender/render/intern/source/pointdensity.c
    branches/ge_harmony/source/blender/render/intern/source/rayshade.c
    branches/ge_harmony/source/blender/render/intern/source/render_result.c
    branches/ge_harmony/source/blender/render/intern/source/render_texture.c
    branches/ge_harmony/source/blender/render/intern/source/rendercore.c
    branches/ge_harmony/source/blender/render/intern/source/renderdatabase.c
    branches/ge_harmony/source/blender/render/intern/source/shadbuf.c
    branches/ge_harmony/source/blender/render/intern/source/shadeinput.c
    branches/ge_harmony/source/blender/render/intern/source/shadeoutput.c
    branches/ge_harmony/source/blender/render/intern/source/sss.c
    branches/ge_harmony/source/blender/render/intern/source/strand.c
    branches/ge_harmony/source/blender/render/intern/source/sunsky.c
    branches/ge_harmony/source/blender/render/intern/source/volume_precache.c
    branches/ge_harmony/source/blender/render/intern/source/volumetric.c
    branches/ge_harmony/source/blender/render/intern/source/voxeldata.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_types.h
    branches/ge_harmony/source/blender/windowmanager/intern/wm.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_apple.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_cursors.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_gesture.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_init_exit.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_jobs.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_keymap.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_operators.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_subwindow.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_window.c
    branches/ge_harmony/source/blender/windowmanager/wm.h
    branches/ge_harmony/source/blender/windowmanager/wm_event_types.h
    branches/ge_harmony/source/blender/windowmanager/wm_window.h
    branches/ge_harmony/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/ge_harmony/source/creator/creator.c
    branches/ge_harmony/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
    branches/ge_harmony/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ArmatureActuator.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ArmatureActuator.h
    branches/ge_harmony/source/gameengine/Converter/BL_ArmatureChannel.h
    branches/ge_harmony/source/gameengine/Converter/BL_ArmatureConstraint.h
    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_MeshDeformer.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_MeshDeformer.h
    branches/ge_harmony/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/ge_harmony/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
    branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/ge_harmony/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/ge_harmony/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/ge_harmony/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/ge_harmony/source/gameengine/Expressions/BoolValue.cpp
    branches/ge_harmony/source/gameengine/Expressions/BoolValue.h
    branches/ge_harmony/source/gameengine/Expressions/EmptyValue.h
    branches/ge_harmony/source/gameengine/Expressions/ErrorValue.h
    branches/ge_harmony/source/gameengine/Expressions/Expression.h
    branches/ge_harmony/source/gameengine/Expressions/FloatValue.h
    branches/ge_harmony/source/gameengine/Expressions/IfExpr.cpp
    branches/ge_harmony/source/gameengine/Expressions/InputParser.cpp
    branches/ge_harmony/source/gameengine/Expressions/IntValue.cpp
    branches/ge_harmony/source/gameengine/Expressions/IntValue.h
    branches/ge_harmony/source/gameengine/Expressions/ListValue.h
    branches/ge_harmony/source/gameengine/Expressions/Operator1Expr.h
    branches/ge_harmony/source/gameengine/Expressions/Operator2Expr.cpp
    branches/ge_harmony/source/gameengine/Expressions/Operator2Expr.h
    branches/ge_harmony/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/ge_harmony/source/gameengine/Expressions/PyObjectPlus.h
    branches/ge_harmony/source/gameengine/Expressions/StringValue.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/GameLogic/Joystick/SCA_Joystick.h
    branches/ge_harmony/source/gameengine/GameLogic/SCA_IInputDevice.h
    branches/ge_harmony/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_ISensor.h
    branches/ge_harmony/source/gameengine/GameLogic/SCA_JoystickSensor.h
    branches/ge_harmony/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_LogicManager.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_LogicManager.h
    branches/ge_harmony/source/gameengine/GameLogic/SCA_MouseManager.h
    branches/ge_harmony/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_Canvas.h
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_Engine.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_Engine.h
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_RawImage.h
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_RenderTools.h
    branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
    branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
    branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/xembed/UnixShell.c
    branches/ge_harmony/source/gameengine/Ketsji/BL_Action.cpp
    branches/ge_harmony/source/gameengine/Ketsji/BL_Material.h
    branches/ge_harmony/source/gameengine/Ketsji/BL_Shader.h
    branches/ge_harmony/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
    branches/ge_harmony/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
    branches/ge_harmony/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_Camera.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_Camera.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_CameraActuator.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_ConstraintWrapper.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_Dome.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_Dome.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_FontObject.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_FontObject.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_GameObject.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_IPhysicsController.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_IPhysicsController.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_IpoActuator.h
    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.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_MouseFocusSensor.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_NavMeshObject.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_NavMeshObject.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_NearSensor.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_PolyProxy.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_PyConstraintBinding.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_RadarSensor.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_SteeringActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_SteeringActuator.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_TimeLogger.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_VertexProxy.h
    branches/ge_harmony/source/gameengine/Network/NG_NetworkMessage.h
    branches/ge_harmony/source/gameengine/Network/NG_NetworkScene.h
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/ge_harmony/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_ICanvas.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_Polygon.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/ge_harmony/source/gameengine/SceneGraph/SG_BBox.h
    branches/ge_harmony/source/gameengine/SceneGraph/SG_Controller.cpp
    branches/ge_harmony/source/gameengine/SceneGraph/SG_Controller.h
    branches/ge_harmony/source/gameengine/SceneGraph/SG_IObject.h
    branches/ge_harmony/source/gameengine/SceneGraph/SG_Node.h
    branches/ge_harmony/source/gameengine/SceneGraph/SG_ParentRelation.h
    branches/ge_harmony/source/gameengine/SceneGraph/SG_Spatial.h
    branches/ge_harmony/source/gameengine/SceneGraph/SG_Tree.h
    branches/ge_harmony/source/gameengine/VideoTexture/BlendType.h
    branches/ge_harmony/source/gameengine/VideoTexture/Common.h
    branches/ge_harmony/source/gameengine/VideoTexture/Exception.h
    branches/ge_harmony/source/gameengine/VideoTexture/FilterBase.h
    branches/ge_harmony/source/gameengine/VideoTexture/FilterBlueScreen.h
    branches/ge_harmony/source/gameengine/VideoTexture/FilterColor.h
    branches/ge_harmony/source/gameengine/VideoTexture/FilterNormal.h
    branches/ge_harmony/source/gameengine/VideoTexture/FilterSource.h
    branches/ge_harmony/source/gameengine/VideoTexture/ImageBase.h
    branches/ge_harmony/source/gameengine/VideoTexture/ImageBuff.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/ImageBuff.h
    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.h
    branches/ge_harmony/source/gameengine/VideoTexture/Texture.h
    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/tests/bl_load_addons.py
    branches/ge_harmony/source/tests/bl_run_operators.py
    branches/ge_harmony/source/tools/spell_check_source.py
    branches/ge_harmony/source/tools/spell_check_source_config.py

Added Paths:
-----------
    branches/ge_harmony/extern/libmv/third_party/gflags/AUTHORS
    branches/ge_harmony/extern/libmv/third_party/gflags/COPYING
    branches/ge_harmony/extern/libmv/third_party/gflags/ChangeLog
    branches/ge_harmony/extern/libmv/third_party/gflags/NEWS
    branches/ge_harmony/extern/libmv/third_party/gflags/gflags/
    branches/ge_harmony/extern/libmv/third_party/gflags/util.h
    branches/ge_harmony/release/scripts/templates/bmesh_simple.py
    branches/ge_harmony/release/scripts/templates/gamelogic_simple.py
    branches/ge_harmony/source/blender/blenlib/BLI_string_cursor_utf8.h
    branches/ge_harmony/source/blender/blenlib/intern/string_cursor_utf8.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_core.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_interp.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_marking.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh_conv.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mods.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operators.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_polygon.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_queries.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_walkers.h
    branches/ge_harmony/source/blender/imbuf/intern/openexr/openexr_stub.cpp
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_select.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_select.h

Removed Paths:
-------------
    branches/ge_harmony/extern/libmv/patches/bundle_tweaks.patch
    branches/ge_harmony/extern/libmv/third_party/gflags/gflags.h
    branches/ge_harmony/extern/libmv/third_party/gflags/gflags_completions.h
    branches/ge_harmony/release/scripts/templates/gamelogic_basic.py
    branches/ge_harmony/source/blender/blenkernel/BKE_bmeshCustomData.h
    branches/ge_harmony/source/blender/blenlib/BLI_sparsemap.h
    branches/ge_harmony/source/blender/blenlib/intern/dynamiclist.h
    branches/ge_harmony/source/blender/bmesh/bmesh_iterators.h
    branches/ge_harmony/source/blender/bmesh/bmesh_marking.h
    branches/ge_harmony/source/blender/bmesh/bmesh_operators.h
    branches/ge_harmony/source/blender/bmesh/bmesh_queries.h
    branches/ge_harmony/source/blender/bmesh/bmesh_walkers.h
    branches/ge_harmony/source/blender/bmesh/docs/
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_newcore.c
    branches/ge_harmony/source/gameengine/PyDoc/

Property Changed:
----------------
    branches/ge_harmony/
    branches/ge_harmony/extern/libmv/third_party/gflags/gflags/gflags_declare.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/windows/preprocess.sh
    branches/ge_harmony/source/blender/blenlib/BLI_smallhash.h
    branches/ge_harmony/source/blender/editors/mesh/knifetool.c
    branches/ge_harmony/source/blender/editors/space_outliner/


Property changes on: branches/ge_harmony
___________________________________________________________________
Modified: svn:mergeinfo
   - /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
/trunk/blender:42243-44476
   + /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
/trunk/blender:42243-44836

Modified: branches/ge_harmony/CMakeLists.txt
===================================================================
--- branches/ge_harmony/CMakeLists.txt	2012-03-12 14:55:56 UTC (rev 44836)
+++ branches/ge_harmony/CMakeLists.txt	2012-03-12 18:53:22 UTC (rev 44837)
@@ -249,19 +249,44 @@
 		"Choose the architecture you want to build Blender for: i386, x86_64 or ppc"
 		FORCE)
 	endif()
+	
+	execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version
+	if (${MAC_SYS} MATCHES 11)
+		set(OSX_SYSTEM 10.7)
+	elseif(${MAC_SYS} MATCHES 10)
+		set(OSX_SYSTEM 10.6)
+	elseif(${MAC_SYS} MATCHES 9)
+		set(OSX_SYSTEM 10.5)
+	else()
+		set(OSX_SYSTEM unsupported)
+	endif()
+	message(STATUS "Detected system-version: " ${OSX_SYSTEM})
+	
 	if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-		set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5 CACHE STRING
-		"Choose the minimum OSX version required: 10.4 or 10.5"
-		FORCE)
+			set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our minimum target, if you have higher sdk, weak linking happens
 	endif()
+
 	if(${CMAKE_GENERATOR} MATCHES "Xcode")
 		if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4)
 			# Xcode 4 defaults to the Apple LLVM Compiler.
 			# Override the default compiler selection because Blender only compiles with gcc
 			set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
 			message(STATUS "Setting compiler to: " ${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION})
+			
+			##### workaround for actual official cmake incompatibility with xcode 4.3 #####	
+			if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var
+				message("Official cmake does not yet support Xcode 4.3, get a patched version here: http://www.jensverwiebe.de/Blender/CMake%202.8-7patched.zip")
+			endif()
+			##### end workaround for actual official cmake incompatibility with xcode 4.3 #####	
+			
 		endif()
+	else() # unix makefile generator does not fill XCODE_VERSION var, so we get it with a command
+		execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE XCODE_VERS_BUILDNR )
+		STRING(SUBSTRING ${XCODE_VERS_BUILDNR} 6 3 XCODE_VERSION) # truncate away build-nr
 	endif()
+	
+	message(STATUS "Detected Xcode-version: " ${XCODE_VERSION})
+	
 	option(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
 	option(USE_QTKIT	  "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
 	option(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
@@ -1065,10 +1090,20 @@
 
 elseif(APPLE)
 
-	if (${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.5")
-		set(WITH_LIBS10.5 ON CACHE BOOL "Use 10.5 libs" FORCE)
+	if(${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.5" OR ${CMAKE_OSX_DEPLOYMENT_TARGET} STRGREATER "10.5")
+		set(WITH_LIBS10.5 ON CACHE BOOL "Use 10.5 libs" FORCE) # valid also for 10.6/10.7
 	endif()
 
+	if(${XCODE_VERSION} LESS 4.3)
+		SET(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE ) # use guaranteed existing sdk
+	else()
+		# note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
+		# absolute pathes are more foolproof here !
+		SET(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
+		SET(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
+		SET(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
+	endif()	
+	
 	if(WITH_LIBS10.5)
 		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-9.x.universal)
 	else()
@@ -1496,14 +1531,6 @@
 	endif()
 endif()
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-	if(WITH_IK_ITASC)
-		message(WARNING "Using Clang as CXX compiler: disabling WITH_IK_ITASC, this feature will be missing.")
-		set(WITH_IK_ITASC OFF)
-	endif()
-endif()
-
-
 # ensure python header is found since detection can fail, this could happen
 # with _any_ library but since we used a fixed python version this tends to
 # be most problematic.

Modified: branches/ge_harmony/GNUmakefile
===================================================================
--- branches/ge_harmony/GNUmakefile	2012-03-12 14:55:56 UTC (rev 44836)
+++ branches/ge_harmony/GNUmakefile	2012-03-12 18:53:22 UTC (rev 44837)
@@ -166,10 +166,11 @@
 	@echo "  * test_deprecated - checks for deprecation tags in our code which may need to be removed"
 	@echo ""
 	@echo "Static Source Code Checking (not assosiated with building blender)"
-	@echo "  * check_cppcheck  - run blender source through cppcheck (C & C++)"
-	@echo "  * check_splint    - run blenders source through splint (C only)"
-	@echo "  * check_sparse    - run blenders source through sparse (C only)"
-	@echo "  * check_spelling  - check for spelling errors (Python only for now)"
+	@echo "  * check_cppcheck    - run blender source through cppcheck (C & C++)"
+	@echo "  * check_splint      - run blenders source through splint (C only)"
+	@echo "  * check_sparse      - run blenders source through sparse (C only)"
+	@echo "  * check_spelling_c  - check for spelling errors (C/C++ only)"
+	@echo "  * check_spelling_py - check for spelling errors (Python only)"
 	@echo ""
 	@echo "Documentation Targets (not assosiated with building blender)"
 	@echo "  * doc_py   - generate sphinx python api docs"
@@ -243,10 +244,13 @@
 	$(CMAKE_CONFIG)
 	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
 
-check_spelling:
-	cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py `find $(BLENDER_DIR)/release/scripts -name "*.py" | sort`
+check_spelling_py:
+	cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/release/scripts
 
+check_spelling_c:
+	cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/source
 
+
 # -----------------------------------------------------------------------------
 # Documentation
 #
@@ -258,7 +262,7 @@
 	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
 
 doc_doxy:
-	cd doc/doxygen; doxygen 
+	cd doc/doxygen; doxygen Doxyfile
 	@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
 
 doc_dna:

Modified: branches/ge_harmony/SConstruct
===================================================================
--- branches/ge_harmony/SConstruct	2012-03-12 14:55:56 UTC (rev 44836)
+++ branches/ge_harmony/SConstruct	2012-03-12 18:53:22 UTC (rev 44837)
@@ -266,6 +266,7 @@
     target_env_defs['WITH_BF_REMESH'] = False
     target_env_defs['WITH_BF_PYTHON'] = False
     target_env_defs['WITH_BF_3DMOUSE'] = False
+    target_env_defs['WITH_BF_LIBMV'] = False
     
     # Merge blenderlite, let command line to override
     for k,v in target_env_defs.iteritems():

Modified: branches/ge_harmony/doc/doxygen/Doxyfile
===================================================================
--- branches/ge_harmony/doc/doxygen/Doxyfile	2012-03-12 14:55:56 UTC (rev 44836)
+++ branches/ge_harmony/doc/doxygen/Doxyfile	2012-03-12 18:53:22 UTC (rev 44837)
@@ -31,7 +31,7 @@
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = "V2.59"
+PROJECT_NUMBER         = "V2.6x"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
@@ -648,7 +648,7 @@
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = ../../source/gameengine/PyDoc
+EXCLUDE                = ../../build_files, ../../release
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix file system feature) are excluded 
@@ -662,7 +662,7 @@
 # against the file with absolute path, so to exclude all test directories 
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = .svn
+EXCLUDE_PATTERNS       = .svn .git *.py
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
 # (namespaces, classes, functions, etc.) that should be excluded from the 

Modified: branches/ge_harmony/doc/doxygen/doxygen.source
===================================================================
--- branches/ge_harmony/doc/doxygen/doxygen.source	2012-03-12 14:55:56 UTC (rev 44836)
+++ branches/ge_harmony/doc/doxygen/doxygen.source	2012-03-12 18:53:22 UTC (rev 44837)
@@ -8,14 +8,14 @@
 /** \defgroup render Rendering
  *  \ingroup blender
  */
-/** \defgroup meshedit Mesh Editing */
+/** \defgroup bmesh BMesh
+ *  \ingroup blender
+ */
 /** \defgroup texture Texturing */
 /** \defgroup compositor Compositing */
 
-/** \defgroup scripts Scripting */
-
 /** \defgroup python Python
- *  \ingroup blender scripts
+ *  \ingroup blender
  */
 
 /** \defgroup pygen Python Generic
@@ -332,7 +332,7 @@
  *  \ingroup imbuf
  */
 
-/** \defgorup imbdds DDS
+/** \defgroup imbdds DDS
  *  \ingroup imbuf
  */
 

Modified: branches/ge_harmony/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/ge_harmony/doc/python_api/rst/bge.types.rst	2012-03-12 14:55:56 UTC (rev 44836)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list