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

Daniel Stokes kupomail at gmail.com
Sun Apr 22 04:41:18 CEST 2012


Revision: 45838
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45838
Author:   kupoman
Date:     2012-04-22 02:41:10 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
Merged revisions 44836-45832 from trunk/blender

Modified Paths:
--------------
    branches/ge_harmony/CMakeLists.txt
    branches/ge_harmony/SConstruct
    branches/ge_harmony/build_files/cmake/project_info.py
    branches/ge_harmony/build_files/scons/config/darwin-config.py
    branches/ge_harmony/build_files/scons/config/freebsd7-config.py
    branches/ge_harmony/build_files/scons/config/freebsd8-config.py
    branches/ge_harmony/build_files/scons/config/freebsd9-config.py
    branches/ge_harmony/build_files/scons/config/linux-config.py
    branches/ge_harmony/build_files/scons/config/linuxcross-config.py
    branches/ge_harmony/build_files/scons/config/win32-mingw-config.py
    branches/ge_harmony/build_files/scons/config/win32-vc-config.py
    branches/ge_harmony/build_files/scons/config/win64-vc-config.py
    branches/ge_harmony/build_files/scons/tools/Blender.py
    branches/ge_harmony/build_files/scons/tools/btools.py
    branches/ge_harmony/doc/manpage/blender.1
    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_gotcha.rst
    branches/ge_harmony/doc/python_api/sphinx_doc_gen.py
    branches/ge_harmony/extern/carve/CMakeLists.txt
    branches/ge_harmony/extern/carve/bundle.sh
    branches/ge_harmony/extern/carve/include/carve/exact.hpp
    branches/ge_harmony/extern/carve/include/carve/kd_node.hpp
    branches/ge_harmony/extern/carve/include/carve/mesh_impl.hpp
    branches/ge_harmony/extern/carve/include/carve/polyhedron_impl.hpp
    branches/ge_harmony/extern/carve/patches/strict_flags.patch
    branches/ge_harmony/extern/eltopo/common/array1.h
    branches/ge_harmony/extern/eltopo/common/array2.h
    branches/ge_harmony/extern/eltopo/common/array3.h
    branches/ge_harmony/extern/eltopo/common/array3_utils.h
    branches/ge_harmony/extern/eltopo/common/bfstream.cpp
    branches/ge_harmony/extern/eltopo/common/bfstream.h
    branches/ge_harmony/extern/eltopo/common/blas_wrapper.h
    branches/ge_harmony/extern/eltopo/common/ccd_wrapper.cpp
    branches/ge_harmony/extern/eltopo/common/ccd_wrapper.h
    branches/ge_harmony/extern/eltopo/common/collisionqueries.cpp
    branches/ge_harmony/extern/eltopo/common/collisionqueries.h
    branches/ge_harmony/extern/eltopo/common/cubic_ccd_wrapper.cpp
    branches/ge_harmony/extern/eltopo/common/fileio.cpp
    branches/ge_harmony/extern/eltopo/common/fileio.h
    branches/ge_harmony/extern/eltopo/common/gluvi.cpp
    branches/ge_harmony/extern/eltopo/common/gluvi.h
    branches/ge_harmony/extern/eltopo/common/grid3.h
    branches/ge_harmony/extern/eltopo/common/hashtable.h
    branches/ge_harmony/extern/eltopo/common/lapack_wrapper.h
    branches/ge_harmony/extern/eltopo/common/makelevelset3.cpp
    branches/ge_harmony/extern/eltopo/common/makelevelset3.h
    branches/ge_harmony/extern/eltopo/common/mat.h
    branches/ge_harmony/extern/eltopo/common/matlapack.h
    branches/ge_harmony/extern/eltopo/common/newsparse/dense_matrix.cpp
    branches/ge_harmony/extern/eltopo/common/newsparse/dense_matrix.h
    branches/ge_harmony/extern/eltopo/common/newsparse/krylov_solvers.cpp
    branches/ge_harmony/extern/eltopo/common/newsparse/krylov_solvers.h
    branches/ge_harmony/extern/eltopo/common/newsparse/linear_operator.h
    branches/ge_harmony/extern/eltopo/common/newsparse/sparse_matrix.cpp
    branches/ge_harmony/extern/eltopo/common/newsparse/sparse_matrix.h
    branches/ge_harmony/extern/eltopo/common/predicates.cpp
    branches/ge_harmony/extern/eltopo/common/predicates.h
    branches/ge_harmony/extern/eltopo/common/tunicate/expansion.cpp
    branches/ge_harmony/extern/eltopo/common/tunicate/expansion.h
    branches/ge_harmony/extern/eltopo/common/tunicate/intersection.cpp
    branches/ge_harmony/extern/eltopo/common/tunicate/neg.cpp
    branches/ge_harmony/extern/eltopo/common/tunicate/neg.h
    branches/ge_harmony/extern/eltopo/common/tunicate/orientation.cpp
    branches/ge_harmony/extern/eltopo/common/tunicate/sos_intersection.cpp
    branches/ge_harmony/extern/eltopo/common/tunicate/sos_orientation.cpp
    branches/ge_harmony/extern/eltopo/common/tunicate/tunicate.h
    branches/ge_harmony/extern/eltopo/common/util.h
    branches/ge_harmony/extern/eltopo/common/vec.h
    branches/ge_harmony/extern/eltopo/common/vector_math.h
    branches/ge_harmony/extern/eltopo/common/wallclocktime.cpp
    branches/ge_harmony/extern/eltopo/eltopo-capi.cpp
    branches/ge_harmony/extern/eltopo/eltopo-capi.h
    branches/ge_harmony/extern/eltopo/eltopo3d/Makefile
    branches/ge_harmony/extern/eltopo/eltopo3d/Makefile.example_defs
    branches/ge_harmony/extern/eltopo/eltopo3d/Makefile.inc
    branches/ge_harmony/extern/eltopo/eltopo3d/accelerationgrid.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/accelerationgrid.h
    branches/ge_harmony/extern/eltopo/eltopo3d/broadphase.h
    branches/ge_harmony/extern/eltopo/eltopo3d/broadphasegrid.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/broadphasegrid.h
    branches/ge_harmony/extern/eltopo/eltopo3d/dynamicsurface.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/dynamicsurface.h
    branches/ge_harmony/extern/eltopo/eltopo3d/eltopo.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/eltopo.h
    branches/ge_harmony/extern/eltopo/eltopo3d/nondestructivetrimesh.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/nondestructivetrimesh.h
    branches/ge_harmony/extern/eltopo/eltopo3d/options.h
    branches/ge_harmony/extern/eltopo/eltopo3d/subdivisionscheme.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/subdivisionscheme.h
    branches/ge_harmony/extern/eltopo/eltopo3d/surftrack.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/surftrack.h
    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/image/sample.h
    branches/ge_harmony/extern/libmv/libmv/numeric/numeric.h
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/resect.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/brute_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/brute_region_tracker.h
    branches/ge_harmony/extern/libmv/libmv/tracking/esm_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv-capi.cpp
    branches/ge_harmony/extern/libmv/libmv-capi.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/config.h
    branches/ge_harmony/intern/CMakeLists.txt
    branches/ge_harmony/intern/SConscript
    branches/ge_harmony/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_CarveInterface.cpp
    branches/ge_harmony/intern/boolop/intern/BOP_Triangulator.cpp
    branches/ge_harmony/intern/cycles/app/cycles_xml.cpp
    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_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/blender/blender_util.h
    branches/ge_harmony/intern/cycles/device/device_opencl.cpp
    branches/ge_harmony/intern/cycles/kernel/CMakeLists.txt
    branches/ge_harmony/intern/cycles/kernel/kernel_accumulate.h
    branches/ge_harmony/intern/cycles/kernel/kernel_bvh.h
    branches/ge_harmony/intern/cycles/kernel/kernel_camera.h
    branches/ge_harmony/intern/cycles/kernel/kernel_emission.h
    branches/ge_harmony/intern/cycles/kernel/kernel_mbvh.h
    branches/ge_harmony/intern/cycles/kernel/kernel_object.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_qbvh.h
    branches/ge_harmony/intern/cycles/kernel/kernel_types.h
    branches/ge_harmony/intern/cycles/kernel/svm/bsdf_microfacet.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_camera.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_mapping.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_tex_coord.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_types.h
    branches/ge_harmony/intern/cycles/render/CMakeLists.txt
    branches/ge_harmony/intern/cycles/render/background.cpp
    branches/ge_harmony/intern/cycles/render/background.h
    branches/ge_harmony/intern/cycles/render/buffers.cpp
    branches/ge_harmony/intern/cycles/render/buffers.h
    branches/ge_harmony/intern/cycles/render/camera.cpp
    branches/ge_harmony/intern/cycles/render/film.cpp
    branches/ge_harmony/intern/cycles/render/film.h
    branches/ge_harmony/intern/cycles/render/integrator.cpp
    branches/ge_harmony/intern/cycles/render/integrator.h
    branches/ge_harmony/intern/cycles/render/light.cpp
    branches/ge_harmony/intern/cycles/render/nodes.cpp
    branches/ge_harmony/intern/cycles/render/nodes.h
    branches/ge_harmony/intern/cycles/render/object.cpp
    branches/ge_harmony/intern/cycles/render/scene.h
    branches/ge_harmony/intern/cycles/render/session.cpp
    branches/ge_harmony/intern/cycles/render/shader.cpp
    branches/ge_harmony/intern/cycles/render/svm.cpp
    branches/ge_harmony/intern/cycles/render/svm.h
    branches/ge_harmony/intern/cycles/subd/subd_dice.cpp
    branches/ge_harmony/intern/cycles/subd/subd_dice.h
    branches/ge_harmony/intern/cycles/subd/subd_mesh.cpp
    branches/ge_harmony/intern/cycles/subd/subd_mesh.h
    branches/ge_harmony/intern/cycles/subd/subd_split.cpp
    branches/ge_harmony/intern/cycles/subd/subd_split.h
    branches/ge_harmony/intern/cycles/util/util_boundbox.h
    branches/ge_harmony/intern/cycles/util/util_cuda.h
    branches/ge_harmony/intern/cycles/util/util_math.h
    branches/ge_harmony/intern/cycles/util/util_transform.cpp
    branches/ge_harmony/intern/cycles/util/util_transform.h
    branches/ge_harmony/intern/decimation/intern/LOD_EdgeCollapser.cpp
    branches/ge_harmony/intern/decimation/intern/LOD_QSDecimator.cpp
    branches/ge_harmony/intern/dualcon/intern/Projections.h
    branches/ge_harmony/intern/dualcon/intern/dualcon_c_api.cpp
    branches/ge_harmony/intern/ghost/CMakeLists.txt
    branches/ge_harmony/intern/ghost/GHOST_C-api.h
    branches/ge_harmony/intern/ghost/GHOST_ISystem.h
    branches/ge_harmony/intern/ghost/SConscript
    branches/ge_harmony/intern/ghost/intern/GHOST_C-api.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_DisplayManager.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_DisplayManagerSDL.h
    branches/ge_harmony/intern/ghost/intern/GHOST_DropTargetWin32.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_System.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_System.h
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemPathsWin32.h
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemSDL.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemSDL.h
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemWin32.h
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowSDL.h
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowWin32.h
    branches/ge_harmony/intern/guardedalloc/intern/mallocn.c
    branches/ge_harmony/intern/opennl/CMakeLists.txt
    branches/ge_harmony/release/datafiles/blender_icons.png
    branches/ge_harmony/release/datafiles/ctodata.py
    branches/ge_harmony/release/datafiles/datatoc.py
    branches/ge_harmony/release/datafiles/fonts/droidsans.ttf.gz
    branches/ge_harmony/release/freedesktop/blender.desktop
    branches/ge_harmony/release/plugins/sequence/color-correction-hsv.c
    branches/ge_harmony/release/plugins/sequence/color-correction-yuv.c
    branches/ge_harmony/release/plugins/sequence/dnr.c
    branches/ge_harmony/release/plugins/sequence/gamma.c
    branches/ge_harmony/release/plugins/texture/clouds2.c
    branches/ge_harmony/release/plugins/texture/tiles.c
    branches/ge_harmony/release/scripts/modules/addon_utils.py
    branches/ge_harmony/release/scripts/modules/bpy/__init__.py
    branches/ge_harmony/release/scripts/modules/bpy/path.py
    branches/ge_harmony/release/scripts/modules/bpy/utils.py
    branches/ge_harmony/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/ge_harmony/release/scripts/modules/bpy_extras/object_utils.py
    branches/ge_harmony/release/scripts/modules/bpy_types.py
    branches/ge_harmony/release/scripts/modules/console_python.py
    branches/ge_harmony/release/scripts/modules/rna_xml.py
    branches/ge_harmony/release/scripts/presets/interface_theme/back_to_black.xml
    branches/ge_harmony/release/scripts/presets/interface_theme/blender_24x.xml
    branches/ge_harmony/release/scripts/presets/interface_theme/elsyiun.xml
    branches/ge_harmony/release/scripts/presets/interface_theme/hexagon.xml
    branches/ge_harmony/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
    branches/ge_harmony/release/scripts/presets/keyconfig/maya.py
    branches/ge_harmony/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/ge_harmony/release/scripts/startup/bl_operators/clip.py
    branches/ge_harmony/release/scripts/startup/bl_operators/console.py
    branches/ge_harmony/release/scripts/startup/bl_operators/image.py
    branches/ge_harmony/release/scripts/startup/bl_operators/mesh.py
    branches/ge_harmony/release/scripts/startup/bl_operators/object.py
    branches/ge_harmony/release/scripts/startup/bl_operators/object_randomize_transform.py
    branches/ge_harmony/release/scripts/startup/bl_operators/presets.py
    branches/ge_harmony/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/ge_harmony/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/ge_harmony/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/ge_harmony/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/ge_harmony/release/scripts/startup/bl_operators/view3d.py
    branches/ge_harmony/release/scripts/startup/bl_operators/wm.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_mesh.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.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_particle.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_cloth.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_softbody.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_texture.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_clip.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_graph.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_image.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_info.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_nla.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_sequencer.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_userpref.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/ge_harmony/release/scripts/templates/addon_add_object.py
    branches/ge_harmony/release/scripts/templates/operator_mesh_add.py
    branches/ge_harmony/release/scripts/templates/ui_panel_simple.py
    branches/ge_harmony/release/text/readme.html
    branches/ge_harmony/source/blender/avi/intern/avi.c
    branches/ge_harmony/source/blender/avi/intern/avirgb.c
    branches/ge_harmony/source/blender/avi/intern/mjpeg.c
    branches/ge_harmony/source/blender/avi/intern/options.c
    branches/ge_harmony/source/blender/avi/intern/rgb32.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_font.c
    branches/ge_harmony/source/blender/blenfont/intern/blf_glyph.c
    branches/ge_harmony/source/blender/blenfont/intern/blf_lang.c
    branches/ge_harmony/source/blender/blenfont/intern/blf_translation.c
    branches/ge_harmony/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_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_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_customdata.h
    branches/ge_harmony/source/blender/blenkernel/BKE_deform.h
    branches/ge_harmony/source/blender/blenkernel/BKE_global.h
    branches/ge_harmony/source/blender/blenkernel/BKE_key.h
    branches/ge_harmony/source/blender/blenkernel/BKE_lattice.h
    branches/ge_harmony/source/blender/blenkernel/BKE_library.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_object.h
    branches/ge_harmony/source/blender/blenkernel/BKE_paint.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_sequencer.h
    branches/ge_harmony/source/blender/blenkernel/BKE_shrinkwrap.h
    branches/ge_harmony/source/blender/blenkernel/BKE_subsurf.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/SConscript
    branches/ge_harmony/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/ge_harmony/source/blender/blenkernel/intern/DerivedMesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/action.c
    branches/ge_harmony/source/blender/blenkernel/intern/anim.c
    branches/ge_harmony/source/blender/blenkernel/intern/anim_sys.c
    branches/ge_harmony/source/blender/blenkernel/intern/armature.c
    branches/ge_harmony/source/blender/blenkernel/intern/blender.c
    branches/ge_harmony/source/blender/blenkernel/intern/bmfont.c
    branches/ge_harmony/source/blender/blenkernel/intern/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/camera.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/context.c
    branches/ge_harmony/source/blender/blenkernel/intern/curve.c
    branches/ge_harmony/source/blender/blenkernel/intern/customdata.c
    branches/ge_harmony/source/blender/blenkernel/intern/customdata_file.c
    branches/ge_harmony/source/blender/blenkernel/intern/deform.c
    branches/ge_harmony/source/blender/blenkernel/intern/depsgraph.c
    branches/ge_harmony/source/blender/blenkernel/intern/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/fluidsim.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/gpencil.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/paint.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/seqcache.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/suggestions.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/blenkernel/intern/writeframeserver.c
    branches/ge_harmony/source/blender/blenlib/BLI_array.h
    branches/ge_harmony/source/blender/blenlib/BLI_bpath.h
    branches/ge_harmony/source/blender/blenlib/BLI_fileops.h
    branches/ge_harmony/source/blender/blenlib/BLI_gsqueue.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_base.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_geom.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_inline.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_matrix.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_vector.h
    branches/ge_harmony/source/blender/blenlib/BLI_pbvh.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_threads.h
    branches/ge_harmony/source/blender/blenlib/BLI_utildefines.h
    branches/ge_harmony/source/blender/blenlib/BLI_winstuff.h
    branches/ge_harmony/source/blender/blenlib/CMakeLists.txt
    branches/ge_harmony/source/blender/blenlib/SConscript
    branches/ge_harmony/source/blender/blenlib/intern/BLI_args.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_dynstr.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_ghash.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_kdtree.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_linklist.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_mempool.c
    branches/ge_harmony/source/blender/blenlib/intern/bpath.c
    branches/ge_harmony/source/blender/blenlib/intern/callbacks.c
    branches/ge_harmony/source/blender/blenlib/intern/dynlib.c
    branches/ge_harmony/source/blender/blenlib/intern/fileops.c
    branches/ge_harmony/source/blender/blenlib/intern/freetypefont.c
    branches/ge_harmony/source/blender/blenlib/intern/graph.c
    branches/ge_harmony/source/blender/blenlib/intern/gsqueue.c
    branches/ge_harmony/source/blender/blenlib/intern/jitter.c
    branches/ge_harmony/source/blender/blenlib/intern/listbase.c
    branches/ge_harmony/source/blender/blenlib/intern/math_base.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_geom_inline.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/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/rand.c
    branches/ge_harmony/source/blender/blenlib/intern/rct.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/time.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_undofile.h
    branches/ge_harmony/source/blender/blenloader/BLO_writefile.h
    branches/ge_harmony/source/blender/blenloader/intern/readblenentry.c
    branches/ge_harmony/source/blender/blenloader/intern/readfile.c
    branches/ge_harmony/source/blender/blenloader/intern/runtime.c
    branches/ge_harmony/source/blender/blenloader/intern/undofile.c
    branches/ge_harmony/source/blender/blenloader/intern/writefile.c
    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/intern/bmesh_construct.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_construct.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_core.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_core.h
    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.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_marking.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_marking.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh.c
    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_mods.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mods.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operators.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operators.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_polygon.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_polygon.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_private.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_queries.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_queries.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_structure.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_walkers.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_walkers.h
    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_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/ArmatureExporter.cpp
    branches/ge_harmony/source/blender/collada/ArmatureImporter.cpp
    branches/ge_harmony/source/blender/collada/DocumentExporter.cpp
    branches/ge_harmony/source/blender/collada/DocumentImporter.cpp
    branches/ge_harmony/source/blender/collada/DocumentImporter.h
    branches/ge_harmony/source/blender/collada/EffectExporter.cpp
    branches/ge_harmony/source/blender/collada/ErrorHandler.cpp
    branches/ge_harmony/source/blender/collada/ExtraHandler.cpp
    branches/ge_harmony/source/blender/collada/ExtraTags.cpp
    branches/ge_harmony/source/blender/collada/GeometryExporter.cpp
    branches/ge_harmony/source/blender/collada/ImageExporter.cpp
    branches/ge_harmony/source/blender/collada/InstanceWriter.cpp
    branches/ge_harmony/source/blender/collada/LightExporter.cpp
    branches/ge_harmony/source/blender/collada/MaterialExporter.cpp
    branches/ge_harmony/source/blender/collada/MeshImporter.cpp
    branches/ge_harmony/source/blender/collada/SceneExporter.cpp
    branches/ge_harmony/source/blender/collada/TransformWriter.cpp
    branches/ge_harmony/source/blender/collada/collada.cpp
    branches/ge_harmony/source/blender/collada/collada_internal.cpp
    branches/ge_harmony/source/blender/collada/collada_utils.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_filter.c
    branches/ge_harmony/source/blender/editors/animation/anim_ipo_utils.c
    branches/ge_harmony/source/blender/editors/animation/anim_markers.c
    branches/ge_harmony/source/blender/editors/animation/anim_ops.c
    branches/ge_harmony/source/blender/editors/animation/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/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/armature/SConscript
    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_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/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/curve/curve_ops.c
    branches/ge_harmony/source/blender/editors/curve/editcurve.c
    branches/ge_harmony/source/blender/editors/curve/editfont.c
    branches/ge_harmony/source/blender/editors/datafiles/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/datafiles/blender_icons.png.c
    branches/ge_harmony/source/blender/editors/datafiles/preview.blend.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_edit.c
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_ops.c
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_paint.c
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_undo.c
    branches/ge_harmony/source/blender/editors/include/BIF_glutil.h
    branches/ge_harmony/source/blender/editors/include/ED_curve.h
    branches/ge_harmony/source/blender/editors/include/ED_datafiles.h
    branches/ge_harmony/source/blender/editors/include/ED_mesh.h
    branches/ge_harmony/source/blender/editors/include/ED_screen_types.h
    branches/ge_harmony/source/blender/editors/include/ED_uvedit.h
    branches/ge_harmony/source/blender/editors/include/UI_icons.h
    branches/ge_harmony/source/blender/editors/include/UI_interface.h
    branches/ge_harmony/source/blender/editors/include/UI_interface_icons.h
    branches/ge_harmony/source/blender/editors/include/UI_resources.h
    branches/ge_harmony/source/blender/editors/interface/interface.c
    branches/ge_harmony/source/blender/editors/interface/interface_anim.c
    branches/ge_harmony/source/blender/editors/interface/interface_draw.c
    branches/ge_harmony/source/blender/editors/interface/interface_handlers.c
    branches/ge_harmony/source/blender/editors/interface/interface_icons.c
    branches/ge_harmony/source/blender/editors/interface/interface_intern.h
    branches/ge_harmony/source/blender/editors/interface/interface_layout.c
    branches/ge_harmony/source/blender/editors/interface/interface_ops.c
    branches/ge_harmony/source/blender/editors/interface/interface_panel.c
    branches/ge_harmony/source/blender/editors/interface/interface_regions.c
    branches/ge_harmony/source/blender/editors/interface/interface_style.c
    branches/ge_harmony/source/blender/editors/interface/interface_templates.c
    branches/ge_harmony/source/blender/editors/interface/interface_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/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/mesh/editface.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_add.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_bvh.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_bvh.h
    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/metaball/mball_ops.c
    branches/ge_harmony/source/blender/editors/object/object_add.c
    branches/ge_harmony/source/blender/editors/object/object_bake.c
    branches/ge_harmony/source/blender/editors/object/object_constraint.c
    branches/ge_harmony/source/blender/editors/object/object_edit.c
    branches/ge_harmony/source/blender/editors/object/object_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_lattice.c
    branches/ge_harmony/source/blender/editors/object/object_modifier.c
    branches/ge_harmony/source/blender/editors/object/object_ops.c
    branches/ge_harmony/source/blender/editors/object/object_relations.c
    branches/ge_harmony/source/blender/editors/object/object_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_boids.c
    branches/ge_harmony/source/blender/editors/physics/particle_edit.c
    branches/ge_harmony/source/blender/editors/physics/particle_object.c
    branches/ge_harmony/source/blender/editors/physics/physics_fluid.c
    branches/ge_harmony/source/blender/editors/physics/physics_ops.c
    branches/ge_harmony/source/blender/editors/physics/physics_pointcache.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/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/screen/SConscript
    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_context.c
    branches/ge_harmony/source/blender/editors/screen/screen_edit.c
    branches/ge_harmony/source/blender/editors/screen/screen_ops.c
    branches/ge_harmony/source/blender/editors/screen/screendump.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/sculpt_paint/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_ops.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_undo.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_edit.c
    branches/ge_harmony/source/blender/editors/space_action/action_ops.c
    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/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/space_buttons/SConscript
    branches/ge_harmony/source/blender/editors/space_buttons/buttons_context.c
    branches/ge_harmony/source/blender/editors/space_buttons/buttons_header.c
    branches/ge_harmony/source/blender/editors/space_buttons/buttons_ops.c
    branches/ge_harmony/source/blender/editors/space_buttons/buttons_texture.c
    branches/ge_harmony/source/blender/editors/space_buttons/space_buttons.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_buttons.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_draw.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_editor.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_graph_draw.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_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/clip_utils.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_draw.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/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/space_file/SConscript
    branches/ge_harmony/source/blender/editors/space_file/file_draw.c
    branches/ge_harmony/source/blender/editors/space_file/file_ops.c
    branches/ge_harmony/source/blender/editors/space_file/file_panels.c
    branches/ge_harmony/source/blender/editors/space_file/filelist.c
    branches/ge_harmony/source/blender/editors/space_file/filesel.c
    branches/ge_harmony/source/blender/editors/space_file/fsmenu.c
    branches/ge_harmony/source/blender/editors/space_file/space_file.c
    branches/ge_harmony/source/blender/editors/space_graph/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/space_graph/SConscript
    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_ops.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_select.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_ops.c
    branches/ge_harmony/source/blender/editors/space_image/space_image.c
    branches/ge_harmony/source/blender/editors/space_info/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/space_info/SConscript
    branches/ge_harmony/source/blender/editors/space_info/info_draw.c
    branches/ge_harmony/source/blender/editors/space_info/info_ops.c
    branches/ge_harmony/source/blender/editors/space_info/info_report.c
    branches/ge_harmony/source/blender/editors/space_info/info_stats.c
    branches/ge_harmony/source/blender/editors/space_info/space_info.c
    branches/ge_harmony/source/blender/editors/space_info/textview.c
    branches/ge_harmony/source/blender/editors/space_logic/logic_buttons.c
    branches/ge_harmony/source/blender/editors/space_logic/logic_intern.h
    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_logic/space_logic.c
    branches/ge_harmony/source/blender/editors/space_nla/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/space_nla/SConscript
    branches/ge_harmony/source/blender/editors/space_nla/nla_buttons.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_channels.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_draw.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_edit.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_ops.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/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/space_node/SConscript
    branches/ge_harmony/source/blender/editors/space_node/drawnode.c
    branches/ge_harmony/source/blender/editors/space_node/node_buttons.c
    branches/ge_harmony/source/blender/editors/space_node/node_draw.c
    branches/ge_harmony/source/blender/editors/space_node/node_edit.c
    branches/ge_harmony/source/blender/editors/space_node/node_header.c
    branches/ge_harmony/source/blender/editors/space_node/node_intern.h
    branches/ge_harmony/source/blender/editors/space_node/node_ops.c
    branches/ge_harmony/source/blender/editors/space_node/node_select.c
    branches/ge_harmony/source/blender/editors/space_node/node_state.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/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/space_outliner/SConscript
    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_ops.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_select.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_tools.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_tree.c
    branches/ge_harmony/source/blender/editors/space_outliner/space_outliner.c
    branches/ge_harmony/source/blender/editors/space_script/script_edit.c
    branches/ge_harmony/source/blender/editors/space_script/script_ops.c
    branches/ge_harmony/source/blender/editors/space_script/space_script.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_add.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_scopes.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_select.c
    branches/ge_harmony/source/blender/editors/space_sequencer/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_header.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_time/space_time.c
    branches/ge_harmony/source/blender/editors/space_time/time_ops.c
    branches/ge_harmony/source/blender/editors/space_view3d/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/space_view3d/SConscript
    branches/ge_harmony/source/blender/editors/space_view3d/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_ops.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_select.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_snap.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_view.c
    branches/ge_harmony/source/blender/editors/transform/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/transform/SConscript
    branches/ge_harmony/source/blender/editors/transform/transform.c
    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/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/util/SConscript
    branches/ge_harmony/source/blender/editors/util/crazyspace.c
    branches/ge_harmony/source/blender/editors/util/ed_util.c
    branches/ge_harmony/source/blender/editors/util/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/SConscript
    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_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_thumbs.h
    branches/ge_harmony/source/blender/imbuf/SConscript
    branches/ge_harmony/source/blender/imbuf/intern/IMB_anim.h
    branches/ge_harmony/source/blender/imbuf/intern/allocimbuf.c
    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/cineon_dpx.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/cineonlib.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/dpxlib.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/logImageLib.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/logmemfile.c
    branches/ge_harmony/source/blender/imbuf/intern/dds/BlockDXT.cpp
    branches/ge_harmony/source/blender/imbuf/intern/dds/ColorBlock.cpp
    branches/ge_harmony/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/ge_harmony/source/blender/imbuf/intern/dds/dds_api.cpp
    branches/ge_harmony/source/blender/imbuf/intern/divers.c
    branches/ge_harmony/source/blender/imbuf/intern/filetype.c
    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/indexer.c
    branches/ge_harmony/source/blender/imbuf/intern/indexer_dv.c
    branches/ge_harmony/source/blender/imbuf/intern/iris.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/SConscript
    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/png.c
    branches/ge_harmony/source/blender/imbuf/intern/radiance_hdr.c
    branches/ge_harmony/source/blender/imbuf/intern/readimage.c
    branches/ge_harmony/source/blender/imbuf/intern/rectop.c
    branches/ge_harmony/source/blender/imbuf/intern/rotate.c
    branches/ge_harmony/source/blender/imbuf/intern/scaling.c
    branches/ge_harmony/source/blender/imbuf/intern/targa.c
    branches/ge_harmony/source/blender/imbuf/intern/thumbs.c
    branches/ge_harmony/source/blender/imbuf/intern/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/imbuf/intern/writeimage.c
    branches/ge_harmony/source/blender/makesdna/DNA_action_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_customdata_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_genfile.h
    branches/ge_harmony/source/blender/makesdna/DNA_gpencil_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_key_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_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_fluidsim.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_particle_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_sequence_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_smoke_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_space_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/DNA_world_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_enum_types.h
    branches/ge_harmony/source/blender/makesrna/RNA_types.h
    branches/ge_harmony/source/blender/makesrna/SConscript
    branches/ge_harmony/source/blender/makesrna/intern/SConscript
    branches/ge_harmony/source/blender/makesrna/intern/makesrna.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_ID.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_access.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_action.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_action_api.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_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_internal_types.h
    branches/ge_harmony/source/blender/makesrna/intern/rna_key.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_lamp.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_lattice.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_main.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_main_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_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_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_test.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_text.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_texture.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_texture_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_timeline.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_tracking.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_ui.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_ui_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_userdef.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_wm.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_wm_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_world.c
    branches/ge_harmony/source/blender/modifiers/CMakeLists.txt
    branches/ge_harmony/source/blender/modifiers/SConscript
    branches/ge_harmony/source/blender/modifiers/intern/MOD_armature.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_array.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_bevel.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_boolean.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_build.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_cast.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_cloth.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_collision.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_curve.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_decimate.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_hook.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_lattice.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_mask.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_meshdeform.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_ocean.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_particleinstance.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_shapekey.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_shrinkwrap.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_subsurf.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_warp.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_wave.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/modifiers/intern/MOD_weightvgedit.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/ge_harmony/source/blender/nodes/CMakeLists.txt
    branches/ge_harmony/source/blender/nodes/SConscript
    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/nodes/node_composite_alphaOver.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/ge_harmony/source/blender/nodes/intern/node_common.c
    branches/ge_harmony/source/blender/nodes/intern/node_exec.c
    branches/ge_harmony/source/blender/nodes/intern/node_socket.c
    branches/ge_harmony/source/blender/nodes/intern/node_util.c
    branches/ge_harmony/source/blender/nodes/shader/node_shader_tree.c
    branches/ge_harmony/source/blender/nodes/shader/node_shader_util.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_dynamic.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_vectMath.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/nodes/node_texture_bricks.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_checker.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_compose.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_curves.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_math.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_viewer.c
    branches/ge_harmony/source/blender/python/SConscript
    branches/ge_harmony/source/blender/python/bmesh/CMakeLists.txt
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_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.c
    branches/ge_harmony/source/blender/python/generic/bgl.h
    branches/ge_harmony/source/blender/python/generic/blf_py_api.c
    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/idprop_py_api.h
    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_ffmpeg.c
    branches/ge_harmony/source/blender/python/intern/bpy_app_handlers.c
    branches/ge_harmony/source/blender/python/intern/bpy_driver.c
    branches/ge_harmony/source/blender/python/intern/bpy_interface.c
    branches/ge_harmony/source/blender/python/intern/bpy_interface_atexit.c
    branches/ge_harmony/source/blender/python/intern/bpy_library.c
    branches/ge_harmony/source/blender/python/intern/bpy_operator.c
    branches/ge_harmony/source/blender/python/intern/bpy_operator_wrap.c
    branches/ge_harmony/source/blender/python/intern/bpy_props.c
    branches/ge_harmony/source/blender/python/intern/bpy_rna.c
    branches/ge_harmony/source/blender/python/intern/bpy_rna_anim.c
    branches/ge_harmony/source/blender/python/intern/bpy_rna_array.c
    branches/ge_harmony/source/blender/python/intern/bpy_rna_callback.c
    branches/ge_harmony/source/blender/python/intern/bpy_traceback.c
    branches/ge_harmony/source/blender/python/intern/bpy_util.c
    branches/ge_harmony/source/blender/python/intern/gpu.c
    branches/ge_harmony/source/blender/python/intern/gpu.h
    branches/ge_harmony/source/blender/python/mathutils/mathutils.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils.h
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Color.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_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_Matrix.h
    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_Vector.h
    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/python/simple_enum_gen.py
    branches/ge_harmony/source/blender/quicktime/apple/qtkit_export.m
    branches/ge_harmony/source/blender/quicktime/apple/qtkit_import.m
    branches/ge_harmony/source/blender/quicktime/apple/quicktime_export.c
    branches/ge_harmony/source/blender/quicktime/apple/quicktime_import.c
    branches/ge_harmony/source/blender/render/SConscript
    branches/ge_harmony/source/blender/render/extern/include/RE_engine.h
    branches/ge_harmony/source/blender/render/extern/include/RE_pipeline.h
    branches/ge_harmony/source/blender/render/extern/include/RE_render_ext.h
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_empty.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_instance.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/reorganize.h
    branches/ge_harmony/source/blender/render/intern/raytrace/svbvh.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/imagetexture.c
    branches/ge_harmony/source/blender/render/intern/source/initrender.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/CMakeLists.txt
    branches/ge_harmony/source/blender/windowmanager/SConscript
    branches/ge_harmony/source/blender/windowmanager/WM_api.h
    branches/ge_harmony/source/blender/windowmanager/WM_keymap.h
    branches/ge_harmony/source/blender/windowmanager/WM_types.h
    branches/ge_harmony/source/blender/windowmanager/intern/wm.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_apple.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_cursors.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_draw.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_event_system.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_files.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_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/blenderplayer/CMakeLists.txt
    branches/ge_harmony/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/ge_harmony/source/creator/CMakeLists.txt
    branches/ge_harmony/source/creator/creator.c
    branches/ge_harmony/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/ge_harmony/source/gameengine/BlenderRoutines/BL_System.cpp
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/ge_harmony/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/ge_harmony/source/gameengine/Converter/BlenderWorldInfo.cpp
    branches/ge_harmony/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
    branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    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_ConvertProperties.cpp
    branches/ge_harmony/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/ge_harmony/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
    branches/ge_harmony/source/gameengine/Expressions/ErrorValue.cpp
    branches/ge_harmony/source/gameengine/Expressions/Expression.cpp
    branches/ge_harmony/source/gameengine/Expressions/InputParser.cpp
    branches/ge_harmony/source/gameengine/Expressions/IntValue.cpp
    branches/ge_harmony/source/gameengine/Expressions/ListValue.cpp
    branches/ge_harmony/source/gameengine/Expressions/Operator2Expr.cpp
    branches/ge_harmony/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/ge_harmony/source/gameengine/Expressions/PyObjectPlus.h
    branches/ge_harmony/source/gameengine/Expressions/Value.cpp
    branches/ge_harmony/source/gameengine/GameLogic/CMakeLists.txt
    branches/ge_harmony/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/ge_harmony/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_IInputDevice.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_JoystickManager.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
    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_MouseSensor.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
    branches/ge_harmony/source/gameengine/GameLogic/SConscript
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_Engine.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/common/bmfont.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_System.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/xembed/UnixShell.c
    branches/ge_harmony/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
    branches/ge_harmony/source/gameengine/GamePlayer/xembed/npunix.c
    branches/ge_harmony/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/ge_harmony/source/gameengine/Ketsji/BL_Material.cpp
    branches/ge_harmony/source/gameengine/Ketsji/BL_Material.h
    branches/ge_harmony/source/gameengine/Ketsji/BL_Shader.cpp
    branches/ge_harmony/source/gameengine/Ketsji/BL_Texture.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_Camera.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_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_GameObject.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_GameObject.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_Light.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_NavMeshObject.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_ObstacleSimulation.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_PyMath.cpp
    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_RayCast.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_SteeringActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_TimeCategoryLogger.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_TimeLogger.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_FramingManager.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
    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_VAOpenGLRasterizer.cpp
    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.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_IObject.cpp
    branches/ge_harmony/source/gameengine/SceneGraph/SG_Node.cpp
    branches/ge_harmony/source/gameengine/SceneGraph/SG_ParentRelation.h
    branches/ge_harmony/source/gameengine/SceneGraph/SG_Spatial.cpp
    branches/ge_harmony/source/gameengine/SceneGraph/SG_Tree.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/ImageRender.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/VideoFFmpeg.h
    branches/ge_harmony/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/ge_harmony/source/tests/bl_mesh_modifiers.py
    branches/ge_harmony/source/tests/pep8.py
    branches/ge_harmony/source/tools/spell_check_source_config.py

Added Paths:
-----------
    branches/ge_harmony/doc/python_api/rst/include__bmesh.rst
    branches/ge_harmony/extern/eltopo/common/array2_utils.h
    branches/ge_harmony/extern/eltopo/common/ccd_defs.h
    branches/ge_harmony/extern/eltopo/common/commonoptions.h
    branches/ge_harmony/extern/eltopo/common/lexer.cpp
    branches/ge_harmony/extern/eltopo/common/lexer.h
    branches/ge_harmony/extern/eltopo/common/marching_tiles_hires.cpp
    branches/ge_harmony/extern/eltopo/common/marching_tiles_hires.h
    branches/ge_harmony/extern/eltopo/common/newparser.cpp
    branches/ge_harmony/extern/eltopo/common/newparser.h
    branches/ge_harmony/extern/eltopo/common/runstats.cpp
    branches/ge_harmony/extern/eltopo/common/runstats.h
    branches/ge_harmony/extern/eltopo/eltopo3d/collisionpipeline.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/collisionpipeline.h
    branches/ge_harmony/extern/eltopo/eltopo3d/cpp-file-template.txt
    branches/ge_harmony/extern/eltopo/eltopo3d/edgecollapser.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/edgecollapser.h
    branches/ge_harmony/extern/eltopo/eltopo3d/edgeflipper.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/edgeflipper.h
    branches/ge_harmony/extern/eltopo/eltopo3d/edgesplitter.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/edgesplitter.h
    branches/ge_harmony/extern/eltopo/eltopo3d/h-file-template.txt
    branches/ge_harmony/extern/eltopo/eltopo3d/impactzonesolver.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/impactzonesolver.h
    branches/ge_harmony/extern/eltopo/eltopo3d/meshmerger.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/meshmerger.h
    branches/ge_harmony/extern/eltopo/eltopo3d/meshpincher.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/meshpincher.h
    branches/ge_harmony/extern/eltopo/eltopo3d/meshrenderer.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/meshrenderer.h
    branches/ge_harmony/extern/eltopo/eltopo3d/meshsmoother.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/meshsmoother.h
    branches/ge_harmony/extern/eltopo/eltopo3d/trianglequality.cpp
    branches/ge_harmony/extern/eltopo/eltopo3d/trianglequality.h
    branches/ge_harmony/extern/libmv/libmv/image/correlation.h
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/rigid_registration.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/rigid_registration.h
    branches/ge_harmony/extern/libmv/third_party/glog/src/config_hurd.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_ramp.h
    branches/ge_harmony/intern/utfconv/
    branches/ge_harmony/release/datafiles/brushicons/claystrips.png
    branches/ge_harmony/release/scripts/presets/fluid/
    branches/ge_harmony/release/scripts/templates/operator_file_export.py
    branches/ge_harmony/release/scripts/templates/operator_file_import.py
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_error.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_inline.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators_inline.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh_validate.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh_validate.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operator_api_inline.h
    branches/ge_harmony/source/blender/bmesh/operators/bmo_inset.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_slide.c
    branches/ge_harmony/source/blender/editors/datafiles/claystrips.png.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_knife.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_loopcut.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_rip.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_select.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_slide.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_tools.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_utils.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_hide.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types_customdata.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types_customdata.h
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types_meshdata.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types_meshdata.h
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types_select.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types_select.h
    branches/ge_harmony/source/tests/bl_mesh_validate.py
    branches/ge_harmony/source/tools/uncrustify.cfg
    branches/ge_harmony/source/tools/uncrustify_clean.sh
    branches/ge_harmony/source/tools/update_themes.py

Removed Paths:
-------------
    branches/ge_harmony/extern/libmv/libmv/tracking/sad.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/sad.h
    branches/ge_harmony/release/scripts/templates/operator_export.py
    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_inline.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators_inline.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operator_api_inline.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/knifetool.c
    branches/ge_harmony/source/blender/editors/mesh/loopcut.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_select.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_select.h

Property Changed:
----------------
    branches/ge_harmony/
    branches/ge_harmony/extern/libmv/libmv/image/array_nd.cc
    branches/ge_harmony/extern/libmv/libmv/image/convolve.cc
    branches/ge_harmony/extern/libmv/libmv/multiview/conditioning.cc
    branches/ge_harmony/extern/libmv/libmv/multiview/euclidean_resection.cc
    branches/ge_harmony/extern/libmv/libmv/multiview/fundamental.cc
    branches/ge_harmony/extern/libmv/libmv/multiview/projection.cc
    branches/ge_harmony/extern/libmv/libmv/multiview/triangulation.cc
    branches/ge_harmony/extern/libmv/libmv/numeric/numeric.cc
    branches/ge_harmony/extern/libmv/libmv/numeric/poly.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/bundle.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/callbacks.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/detect.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/intersect.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/reconstruction.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/resect.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/tracks.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/brute_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/esm_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/hybrid_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/klt_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/pyramid_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/retrack_region_tracker.cc
    branches/ge_harmony/extern/libmv/libmv/tracking/trklt_region_tracker.cc
    branches/ge_harmony/release/datafiles/ctodata.py
    branches/ge_harmony/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_shlex.py
    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-44836
   + /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-45832

Modified: branches/ge_harmony/CMakeLists.txt
===================================================================
--- branches/ge_harmony/CMakeLists.txt	2012-04-22 02:16:33 UTC (rev 45837)
+++ branches/ge_harmony/CMakeLists.txt	2012-04-22 02:41:10 UTC (rev 45838)
@@ -124,7 +124,7 @@
 mark_as_advanced(WITH_PYTHON_SECURITY)  # some distrobutions see this as a security issue, rather than have them patch it, make a build option.
 
 option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
-option(WITH_PYTHON_MODULE "Enable building as a python module (experemental, only enable for development)" OFF)
+option(WITH_PYTHON_MODULE "Enable building as a python module (experimental, only enable for development)" OFF)
 option(WITH_BUILDINFO     "Include extra build details (only disable for development & faster builds)" ON)
 option(WITH_IK_ITASC      "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
 option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
@@ -149,11 +149,14 @@
 
 # (unix defaults to OpenMP On)
 if(UNIX AND NOT APPLE)
-	option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
+	set(PLATFORM_DEFAULT ON)
 else()
-	option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
+	set(PLATFORM_DEFAULT OFF)
 endif()
+option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ${PLATFORM_DEFAULT})
+unset(PLATFORM_DEFAULT)
 
+
 if(UNIX AND NOT APPLE)
 	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)"	ON)
 	option(WITH_X11_XF86VMODE "Enable X11 video mode switching"	ON)
@@ -176,7 +179,7 @@
 option(WITH_MOD_DECIMATE       	"Enable Decimate Modifier" ON)
 option(WITH_MOD_BOOLEAN        	"Enable Boolean Modifier" ON)
 option(WITH_MOD_REMESH        	"Enable Remesh Modifier" ON)
-option(WITH_MOD_CLOTH_ELTOPO   	"Enable Experemental cloth solver" OFF)
+option(WITH_MOD_CLOTH_ELTOPO   	"Enable Experimental cloth solver" OFF)
 mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
 option(WITH_MOD_OCEANSIM        "Enable Ocean Modifier" OFF)
 
@@ -191,7 +194,14 @@
 option(WITH_IMAGE_FRAMESERVER   "Enable image FrameServer Support for rendering" ON)
 
 # Audio/Video format support
-option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
+if(MINGW)
+	set(PLATFORM_DEFAULT ON)
+else()
+	set(PLATFORM_DEFAULT OFF)
+endif()
+option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" ${PLATFORM_DEFAULT})
+unset(PLATFORM_DEFAULT)
+
 option(WITH_CODEC_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
 if(APPLE OR (WIN32 AND NOT UNIX))
 	option(WITH_CODEC_QUICKTIME     "Enable Quicktime Support" OFF)
@@ -267,18 +277,18 @@
 	endif()
 
 	if(${CMAKE_GENERATOR} MATCHES "Xcode")
-		if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4)
+	
+		##### 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 ###	
+		
+		if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4 AND ${XCODE_VERSION} VERSION_LESS 4.3)
 			# Xcode 4 defaults to the Apple LLVM Compiler.
-			# Override the default compiler selection because Blender only compiles with gcc
+			# Override the default compiler selection because Blender only compiles with gcc up to xcode 4.2
 			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 )
@@ -292,6 +302,7 @@
 	option(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
 endif()
 
+
 #-----------------------------------------------------------------------------
 # Check for conflicting/unsupported configurations
 
@@ -303,8 +314,8 @@
 	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()
 
-if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
-	message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG require WITH_AUDASPACE")
+if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK OR WITH_GAMEENGINE))
+	message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG/WITH_GAMEENGINE require WITH_AUDASPACE")
 endif()
 
 if(NOT WITH_SDL AND WITH_GHOST_SDL)
@@ -324,13 +335,6 @@
 	message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
 endif()
 
-if(MINGW)
-	if(WITH_CODEC_QUICKTIME)
-		message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
-							"because it is currently unsupported, remove this "
-							"line if youre a developer who wants to add support.")
-	endif()
-endif()
 
 if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
 	message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON")
@@ -351,14 +355,53 @@
 	set(WITH_BOOST ON)
 endif()
 
-TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
-
 # don't store paths to libs for portable distrobution
 if(WITH_INSTALL_PORTABLE)
 	set(CMAKE_SKIP_BUILD_RPATH TRUE)
 endif()
 
+if(WITH_GHOST_SDL OR WITH_HEADLESS)
+	set(WITH_GHOST_XDND OFF)
+endif()
+
+if(MINGW)
+	if(WITH_CODEC_QUICKTIME)
+		message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
+		                    "because it is currently unsupported, remove this "
+		                    "line if youre a developer who wants to add support.")
+	endif()
+
+	if((NOT WITH_CODEC_FFMPEG) AND (WITH_CYCLES OR WITH_IMAGE_OPENEXR OR WITH_IMAGE_TIFF))
+		message(FATAL_ERROR "MINGW has a problem with: WITH_CYCLES/WITH_IMAGE_OPENEXR/WITH_IMAGE_TIFF "
+		                    "when WITH_CODEC_FFMPEG is disabled, enable FFMPEG or disable CYCLES/EXR/TIFF.")
+	endif()
+endif()
+
+TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
+
+
 #-----------------------------------------------------------------------------
+# Check for valid directories
+# ... svn extern paths can be missing because of svn-git.
+
+if(WITH_INTERNATIONAL)
+	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
+		message(WARNING "Translation path '${CMAKE_SOURCE_DIR}/release/datafiles/locale' is missing, "
+						"This is an 'svn external', which are known not to work with bridges to other version "
+						"control systems, disabling 'WITH_INTERNATIONAL'.")
+		set(WITH_INTERNATIONAL OFF)
+	endif()
+endif()
+
+if(WITH_PYTHON)
+	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/scripts/addons")
+		message(WARNING "Addons path '${CMAKE_SOURCE_DIR}/release/scripts/addons' is missing, "
+						"This is an 'svn external', which are known not to work with bridges to other version "
+						"control systems: * CONTINUING WITHOUT ADDONS *")
+	endif()
+endif()
+
+#-----------------------------------------------------------------------------
 # Initialize un-cached vars, avoid unused warning
 
 # linux only, not cached
@@ -1633,6 +1676,7 @@
 	info_cfg_option(WITH_X11_XF86VMODE)
 	info_cfg_option(WITH_X11_XINPUT)
 	info_cfg_option(WITH_BUILTIN_GLEW)
+	info_cfg_option(WITH_MEM_JEMALLOC)
 
 	info_cfg_text("Image Formats:")
 	info_cfg_option(WITH_IMAGE_CINEON)

Modified: branches/ge_harmony/SConstruct
===================================================================
--- branches/ge_harmony/SConstruct	2012-04-22 02:16:33 UTC (rev 45837)
+++ branches/ge_harmony/SConstruct	2012-04-22 02:41:10 UTC (rev 45838)
@@ -251,6 +251,7 @@
     target_env_defs['WITH_BF_REDCODE'] = False
     target_env_defs['WITH_BF_DDS'] = False
     target_env_defs['WITH_BF_CINEON'] = False
+    target_env_defs['WITH_BF_FRAMESERVER'] = False
     target_env_defs['WITH_BF_HDR'] = False
     target_env_defs['WITH_BF_ZLIB'] = False
     target_env_defs['WITH_BF_SDL'] = False
@@ -261,6 +262,7 @@
     target_env_defs['BF_BUILDINFO'] = False
     target_env_defs['WITH_BF_FLUID'] = False
     target_env_defs['WITH_BF_OCEANSIM'] = False
+    target_env_defs['WITH_BF_SMOKE'] = False
     target_env_defs['WITH_BF_DECIMATE'] = False
     target_env_defs['WITH_BF_BOOLEAN'] = False
     target_env_defs['WITH_BF_REMESH'] = False

Modified: branches/ge_harmony/build_files/cmake/project_info.py
===================================================================
--- branches/ge_harmony/build_files/cmake/project_info.py	2012-04-22 02:16:33 UTC (rev 45837)
+++ branches/ge_harmony/build_files/cmake/project_info.py	2012-04-22 02:41:10 UTC (rev 45838)
@@ -231,8 +231,13 @@
         return fallback
 
     import subprocess

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list