[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53221] branches/ge_harmony: Merged revisions 51750-53052 from trunk/blender

Daniel Stokes kupomail at gmail.com
Thu Dec 20 22:59:01 CET 2012


Revision: 53221
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53221
Author:   kupoman
Date:     2012-12-20 21:58:59 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
Merged revisions 51750-53052 from trunk/blender

Modified Paths:
--------------
    branches/ge_harmony/CMakeLists.txt
    branches/ge_harmony/SConstruct
    branches/ge_harmony/build_files/build_environment/install_deps.sh
    branches/ge_harmony/build_files/buildbot/config/user-config-glibc211-i686.py
    branches/ge_harmony/build_files/buildbot/config/user-config-glibc211-x86_64.py
    branches/ge_harmony/build_files/buildbot/config/user-config-glibc27-i686.py
    branches/ge_harmony/build_files/buildbot/config/user-config-glibc27-x86_64.py
    branches/ge_harmony/build_files/buildbot/config/user-config-player-glibc211-i686.py
    branches/ge_harmony/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
    branches/ge_harmony/build_files/buildbot/config/user-config-player-glibc27-i686.py
    branches/ge_harmony/build_files/buildbot/config/user-config-player-glibc27-x86_64.py
    branches/ge_harmony/build_files/cmake/cmake_consistency_check.py
    branches/ge_harmony/build_files/cmake/cmake_netbeans_project.py
    branches/ge_harmony/build_files/cmake/cmake_qtcreator_project.py
    branches/ge_harmony/build_files/cmake/cmake_static_check_clang_array.py
    branches/ge_harmony/build_files/cmake/cmake_static_check_cppcheck.py
    branches/ge_harmony/build_files/cmake/cmake_static_check_smatch.py
    branches/ge_harmony/build_files/cmake/cmake_static_check_sparse.py
    branches/ge_harmony/build_files/cmake/cmake_static_check_splint.py
    branches/ge_harmony/build_files/cmake/example_scripts/make_quicky.py
    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-mingw-config.py
    branches/ge_harmony/build_files/scons/config/win64-vc-config.py
    branches/ge_harmony/build_files/scons/tools/Blender.py
    branches/ge_harmony/build_files/scons/tools/btools.py
    branches/ge_harmony/doc/blender_file_format/BlendFileDnaExporter_25.py
    branches/ge_harmony/doc/blender_file_format/BlendFileReader.py
    branches/ge_harmony/doc/manpage/blender.1
    branches/ge_harmony/doc/python_api/rst/bge.logic.rst
    branches/ge_harmony/doc/python_api/rst/bge.types.rst
    branches/ge_harmony/doc/python_api/rst/change_log.rst
    branches/ge_harmony/doc/python_api/rst/include__bmesh.rst
    branches/ge_harmony/doc/python_api/rst/info_gotcha.rst
    branches/ge_harmony/doc/python_api/rst/info_overview.rst
    branches/ge_harmony/doc/python_api/rst/info_quickstart.rst
    branches/ge_harmony/doc/python_api/rst/info_tips_and_tricks.rst
    branches/ge_harmony/doc/python_api/sphinx_doc_gen.py
    branches/ge_harmony/extern/CMakeLists.txt
    branches/ge_harmony/extern/SConscript
    branches/ge_harmony/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
    branches/ge_harmony/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
    branches/ge_harmony/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
    branches/ge_harmony/extern/libmv/CMakeLists.txt
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/resect.cc
    branches/ge_harmony/extern/libmv/libmv-capi.cpp
    branches/ge_harmony/intern/audaspace/CMakeLists.txt
    branches/ge_harmony/intern/audaspace/FX/AUD_ButterworthFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_ButterworthFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_HighpassFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_HighpassFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h
    branches/ge_harmony/intern/audaspace/FX/AUD_LowpassFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_LowpassFactory.h
    branches/ge_harmony/intern/audaspace/intern/AUD_LinearResampleReader.cpp
    branches/ge_harmony/intern/cycles/CMakeLists.txt
    branches/ge_harmony/intern/cycles/SConscript
    branches/ge_harmony/intern/cycles/blender/CMakeLists.txt
    branches/ge_harmony/intern/cycles/blender/addon/__init__.py
    branches/ge_harmony/intern/cycles/blender/addon/engine.py
    branches/ge_harmony/intern/cycles/blender/addon/properties.py
    branches/ge_harmony/intern/cycles/blender/addon/ui.py
    branches/ge_harmony/intern/cycles/blender/blender_camera.cpp
    branches/ge_harmony/intern/cycles/blender/blender_object.cpp
    branches/ge_harmony/intern/cycles/blender/blender_shader.cpp
    branches/ge_harmony/intern/cycles/blender/blender_sync.cpp
    branches/ge_harmony/intern/cycles/blender/blender_util.h
    branches/ge_harmony/intern/cycles/device/device_cpu.cpp
    branches/ge_harmony/intern/cycles/kernel/CMakeLists.txt
    branches/ge_harmony/intern/cycles/kernel/SConscript
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf.h
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf_diffuse.h
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf_microfacet.h
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf_oren_nayar.h
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf_phong_ramp.h
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf_ward.h
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf_westin.h
    branches/ge_harmony/intern/cycles/kernel/closure/emissive.h
    branches/ge_harmony/intern/cycles/kernel/closure/volume.h
    branches/ge_harmony/intern/cycles/kernel/kernel.cpp
    branches/ge_harmony/intern/cycles/kernel/kernel_attribute.h
    branches/ge_harmony/intern/cycles/kernel/kernel_camera.h
    branches/ge_harmony/intern/cycles/kernel/kernel_compat_cpu.h
    branches/ge_harmony/intern/cycles/kernel/kernel_displace.h
    branches/ge_harmony/intern/cycles/kernel/kernel_emission.h
    branches/ge_harmony/intern/cycles/kernel/kernel_globals.h
    branches/ge_harmony/intern/cycles/kernel/kernel_light.h
    branches/ge_harmony/intern/cycles/kernel/kernel_object.h
    branches/ge_harmony/intern/cycles/kernel/kernel_path.h
    branches/ge_harmony/intern/cycles/kernel/kernel_shader.h
    branches/ge_harmony/intern/cycles/kernel/kernel_triangle.h
    branches/ge_harmony/intern/cycles/kernel/kernel_types.h
    branches/ge_harmony/intern/cycles/kernel/osl/CMakeLists.txt
    branches/ge_harmony/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
    branches/ge_harmony/intern/cycles/kernel/osl/emissive.cpp
    branches/ge_harmony/intern/cycles/kernel/osl/osl_closures.cpp
    branches/ge_harmony/intern/cycles/kernel/osl/osl_closures.h
    branches/ge_harmony/intern/cycles/kernel/osl/osl_globals.h
    branches/ge_harmony/intern/cycles/kernel/osl/osl_services.cpp
    branches/ge_harmony/intern/cycles/kernel/osl/osl_services.h
    branches/ge_harmony/intern/cycles/kernel/osl/osl_shader.cpp
    branches/ge_harmony/intern/cycles/kernel/osl/osl_shader.h
    branches/ge_harmony/intern/cycles/kernel/shaders/CMakeLists.txt
    branches/ge_harmony/intern/cycles/kernel/shaders/node_add_closure.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_attribute.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_background.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_brick_texture.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_brightness.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_checker_texture.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_combine_rgb.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_convert_from_color.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_convert_from_float.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_convert_from_int.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_convert_from_normal.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_convert_from_point.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_convert_from_vector.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_emission.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_environment_texture.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_gamma.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_geometry.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_glass_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_glossy_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_gradient_texture.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_hsv.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_image_texture.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_invert.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_light_falloff.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_magic_texture.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_mapping.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_mix.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_mix_closure.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_musgrave_texture.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_noise_texture.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_normal_map.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_output_surface.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_output_volume.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_refraction_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_rgb_ramp.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_separate_rgb.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_sky_texture.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_texture_coordinate.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_translucent_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_transparent_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_value.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_velvet_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_voronoi_texture.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_ward_bsdf.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_wave_texture.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/stdosl.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_brick.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_closure.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_hsv.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_math.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_ramp.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_texture.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_types.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_voronoi.h
    branches/ge_harmony/intern/cycles/render/camera.cpp
    branches/ge_harmony/intern/cycles/render/graph.cpp
    branches/ge_harmony/intern/cycles/render/graph.h
    branches/ge_harmony/intern/cycles/render/mesh.cpp
    branches/ge_harmony/intern/cycles/render/nodes.cpp
    branches/ge_harmony/intern/cycles/render/nodes.h
    branches/ge_harmony/intern/cycles/render/object.cpp
    branches/ge_harmony/intern/cycles/render/object.h
    branches/ge_harmony/intern/cycles/render/osl.cpp
    branches/ge_harmony/intern/cycles/render/osl.h
    branches/ge_harmony/intern/cycles/render/scene.cpp
    branches/ge_harmony/intern/cycles/render/session.cpp
    branches/ge_harmony/intern/cycles/render/shader.cpp
    branches/ge_harmony/intern/cycles/render/shader.h
    branches/ge_harmony/intern/cycles/render/svm.cpp
    branches/ge_harmony/intern/cycles/render/svm.h
    branches/ge_harmony/intern/cycles/util/CMakeLists.txt
    branches/ge_harmony/intern/cycles/util/util_boundbox.h
    branches/ge_harmony/intern/cycles/util/util_thread.h
    branches/ge_harmony/intern/cycles/util/util_transform.cpp
    branches/ge_harmony/intern/cycles/util/util_transform.h
    branches/ge_harmony/intern/cycles/util/util_types.h
    branches/ge_harmony/intern/elbeem/intern/ntl_geometryobject.cpp
    branches/ge_harmony/intern/elbeem/intern/ntl_world.cpp
    branches/ge_harmony/intern/elbeem/intern/ntl_world.h
    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_NDOFManagerCocoa.mm
    branches/ge_harmony/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_System.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_System.h
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemSDL.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowSDL.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/ge_harmony/intern/guardedalloc/intern/mallocn.c
    branches/ge_harmony/intern/iksolver/extern/IK_solver.h
    branches/ge_harmony/intern/iksolver/intern/IK_QJacobianSolver.cpp
    branches/ge_harmony/intern/itasc/kdl/chain.hpp
    branches/ge_harmony/intern/itasc/kdl/tree.hpp
    branches/ge_harmony/intern/locale/CMakeLists.txt
    branches/ge_harmony/intern/memutil/MEM_CacheLimiter.h
    branches/ge_harmony/intern/opennl/CMakeLists.txt
    branches/ge_harmony/intern/smoke/intern/FFT_NOISE.h
    branches/ge_harmony/intern/smoke/intern/WTURBULENCE.cpp
    branches/ge_harmony/intern/tools/bpy_introspect_ui.py
    branches/ge_harmony/intern/tools/credits_svn_gen.py
    branches/ge_harmony/intern/tools/dump_rna2xml.py
    branches/ge_harmony/intern/tools/pydna.py
    branches/ge_harmony/intern/utfconv/utfconv.h
    branches/ge_harmony/release/darwin/blender.app/Contents/Info.plist
    branches/ge_harmony/release/darwin/blenderplayer.app/Contents/Info.plist
    branches/ge_harmony/release/datafiles/blender_icons.png
    branches/ge_harmony/release/datafiles/splash.png
    branches/ge_harmony/release/datafiles/startup.blend
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/settings.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/update_pot.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/update_trunk.py
    branches/ge_harmony/release/scripts/modules/bpy/ops.py
    branches/ge_harmony/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/ge_harmony/release/scripts/modules/bpy_types.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/image.py
    branches/ge_harmony/release/scripts/startup/bl_operators/node.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/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_mesh.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_modifier.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/space_console.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_sequencer.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_text.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_userpref.py
    branches/ge_harmony/release/scripts/templates/bmesh_simple.py
    branches/ge_harmony/release/scripts/templates/script_stub.py
    branches/ge_harmony/source/blender/blenfont/BLF_api.h
    branches/ge_harmony/source/blender/blenfont/BLF_translation.h
    branches/ge_harmony/source/blender/blenfont/intern/blf.c
    branches/ge_harmony/source/blender/blenkernel/BKE_DerivedMesh.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_constraint.h
    branches/ge_harmony/source/blender/blenkernel/BKE_fluidsim.h
    branches/ge_harmony/source/blender/blenkernel/BKE_global.h
    branches/ge_harmony/source/blender/blenkernel/BKE_icons.h
    branches/ge_harmony/source/blender/blenkernel/BKE_lattice.h
    branches/ge_harmony/source/blender/blenkernel/BKE_main.h
    branches/ge_harmony/source/blender/blenkernel/BKE_modifier.h
    branches/ge_harmony/source/blender/blenkernel/BKE_node.h
    branches/ge_harmony/source/blender/blenkernel/BKE_object.h
    branches/ge_harmony/source/blender/blenkernel/BKE_particle.h
    branches/ge_harmony/source/blender/blenkernel/BKE_scene.h
    branches/ge_harmony/source/blender/blenkernel/BKE_sequencer.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/CMakeLists.txt
    branches/ge_harmony/source/blender/blenkernel/SConscript
    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/armature.c
    branches/ge_harmony/source/blender/blenkernel/intern/blender.c
    branches/ge_harmony/source/blender/blenkernel/intern/brush.c
    branches/ge_harmony/source/blender/blenkernel/intern/camera.c
    branches/ge_harmony/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/collision.c
    branches/ge_harmony/source/blender/blenkernel/intern/constraint.c
    branches/ge_harmony/source/blender/blenkernel/intern/curve.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/idcode.c
    branches/ge_harmony/source/blender/blenkernel/intern/image.c
    branches/ge_harmony/source/blender/blenkernel/intern/lattice.c
    branches/ge_harmony/source/blender/blenkernel/intern/library.c
    branches/ge_harmony/source/blender/blenkernel/intern/mask.c
    branches/ge_harmony/source/blender/blenkernel/intern/mask_rasterize.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/modifier.c
    branches/ge_harmony/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/multires.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/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/scene.c
    branches/ge_harmony/source/blender/blenkernel/intern/seqeffects.c
    branches/ge_harmony/source/blender/blenkernel/intern/seqmodifier.c
    branches/ge_harmony/source/blender/blenkernel/intern/sequencer.c
    branches/ge_harmony/source/blender/blenkernel/intern/smoke.c
    branches/ge_harmony/source/blender/blenkernel/intern/speaker.c
    branches/ge_harmony/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/ge_harmony/source/blender/blenkernel/intern/text.c
    branches/ge_harmony/source/blender/blenkernel/intern/texture.c
    branches/ge_harmony/source/blender/blenkernel/intern/tracking.c
    branches/ge_harmony/source/blender/blenkernel/intern/world.c
    branches/ge_harmony/source/blender/blenlib/BLI_array.h
    branches/ge_harmony/source/blender/blenlib/BLI_endian_switch.h
    branches/ge_harmony/source/blender/blenlib/BLI_listbase.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_base.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_color.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_path_util.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_utildefines.h
    branches/ge_harmony/source/blender/blenlib/CMakeLists.txt
    branches/ge_harmony/source/blender/blenlib/SConscript
    branches/ge_harmony/source/blender/blenlib/intern/BLI_ghash.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/ge_harmony/source/blender/blenlib/intern/endian_switch.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/listbase.c
    branches/ge_harmony/source/blender/blenlib/intern/math_base_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_inline.c
    branches/ge_harmony/source/blender/blenlib/intern/path_util.c
    branches/ge_harmony/source/blender/blenlib/intern/rct.c
    branches/ge_harmony/source/blender/blenlib/intern/scanfill.c
    branches/ge_harmony/source/blender/blenlib/intern/string.c
    branches/ge_harmony/source/blender/blenlib/intern/string_cursor_utf8.c
    branches/ge_harmony/source/blender/blenlib/intern/string_utf8.c
    branches/ge_harmony/source/blender/blenlib/intern/winstuff.c
    branches/ge_harmony/source/blender/blenloader/BLO_readfile.h
    branches/ge_harmony/source/blender/blenloader/intern/readfile.c
    branches/ge_harmony/source/blender/blenloader/intern/writefile.c
    branches/ge_harmony/source/blender/bmesh/CMakeLists.txt
    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_marking.c
    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_opdefines.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operator_api_inline.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operators.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operators.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_polygon.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_queries.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_queries.h
    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_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_hull.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_inset.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_join_triangles.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_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_slide.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_smooth_laplacian.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_subdivide.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_subdivide.h
    branches/ge_harmony/source/blender/bmesh/operators/bmo_symmetrize.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_triangulate.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_utils.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_wireframe.c
    branches/ge_harmony/source/blender/bmesh/tools/BME_bevel.c
    branches/ge_harmony/source/blender/bmesh/tools/bmesh_bevel.c
    branches/ge_harmony/source/blender/bmesh/tools/bmesh_decimate.h
    branches/ge_harmony/source/blender/bmesh/tools/bmesh_decimate_collapse.c
    branches/ge_harmony/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
    branches/ge_harmony/source/blender/collada/ArmatureImporter.cpp
    branches/ge_harmony/source/blender/collada/ArmatureImporter.h
    branches/ge_harmony/source/blender/collada/MaterialExporter.cpp
    branches/ge_harmony/source/blender/collada/MeshImporter.cpp
    branches/ge_harmony/source/blender/collada/SkinInfo.cpp
    branches/ge_harmony/source/blender/collada/SkinInfo.h
    branches/ge_harmony/source/blender/collada/TransformReader.cpp
    branches/ge_harmony/source/blender/collada/TransformReader.h
    branches/ge_harmony/source/blender/collada/TransformWriter.cpp
    branches/ge_harmony/source/blender/collada/TransformWriter.h
    branches/ge_harmony/source/blender/collada/collada_internal.cpp
    branches/ge_harmony/source/blender/collada/collada_internal.h
    branches/ge_harmony/source/blender/collada/collada_utils.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/ge_harmony/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_Node.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_Node.h
    branches/ge_harmony/source/blender/compositor/intern/COM_NodeOperation.h
    branches/ge_harmony/source/blender/compositor/intern/COM_WorkPackage.h
    branches/ge_harmony/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ScaleNode.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_CropOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_ImageOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MapRangeOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MovieClipOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_NormalizeOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/ge_harmony/source/blender/datatoc/datatoc.c
    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_draw.c
    branches/ge_harmony/source/blender/editors/animation/anim_markers.c
    branches/ge_harmony/source/blender/editors/animation/keyframes_draw.c
    branches/ge_harmony/source/blender/editors/armature/BIF_generate.h
    branches/ge_harmony/source/blender/editors/armature/editarmature_generate.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/curve/editcurve.c
    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_paint.c
    branches/ge_harmony/source/blender/editors/include/BIF_gl.h
    branches/ge_harmony/source/blender/editors/include/ED_anim_api.h
    branches/ge_harmony/source/blender/editors/include/ED_armature.h
    branches/ge_harmony/source/blender/editors/include/ED_gpencil.h
    branches/ge_harmony/source/blender/editors/include/ED_mask.h
    branches/ge_harmony/source/blender/editors/include/ED_mesh.h
    branches/ge_harmony/source/blender/editors/include/ED_object.h
    branches/ge_harmony/source/blender/editors/include/ED_screen.h
    branches/ge_harmony/source/blender/editors/include/ED_transform.h
    branches/ge_harmony/source/blender/editors/include/ED_view3d.h
    branches/ge_harmony/source/blender/editors/include/UI_icons.h
    branches/ge_harmony/source/blender/editors/include/UI_interface.h
    branches/ge_harmony/source/blender/editors/include/UI_resources.h
    branches/ge_harmony/source/blender/editors/include/UI_view2d.h
    branches/ge_harmony/source/blender/editors/interface/interface.c
    branches/ge_harmony/source/blender/editors/interface/interface_draw.c
    branches/ge_harmony/source/blender/editors/interface/interface_handlers.c
    branches/ge_harmony/source/blender/editors/interface/interface_icons.c
    branches/ge_harmony/source/blender/editors/interface/interface_intern.h
    branches/ge_harmony/source/blender/editors/interface/interface_layout.c
    branches/ge_harmony/source/blender/editors/interface/interface_ops.c
    branches/ge_harmony/source/blender/editors/interface/interface_panel.c
    branches/ge_harmony/source/blender/editors/interface/interface_regions.c
    branches/ge_harmony/source/blender/editors/interface/interface_style.c
    branches/ge_harmony/source/blender/editors/interface/interface_templates.c
    branches/ge_harmony/source/blender/editors/interface/interface_widgets.c
    branches/ge_harmony/source/blender/editors/interface/resources.c
    branches/ge_harmony/source/blender/editors/interface/view2d.c
    branches/ge_harmony/source/blender/editors/mask/mask_edit.c
    branches/ge_harmony/source/blender/editors/mask/mask_editaction.c
    branches/ge_harmony/source/blender/editors/mesh/editface.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_add.c
    branches/ge_harmony/source/blender/editors/mesh/editmesh_bvh.c
    branches/ge_harmony/source/blender/editors/mesh/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/mesh/mesh_intern.h
    branches/ge_harmony/source/blender/editors/mesh/mesh_navmesh.c
    branches/ge_harmony/source/blender/editors/object/object_add.c
    branches/ge_harmony/source/blender/editors/object/object_relations.c
    branches/ge_harmony/source/blender/editors/object/object_shapekey.c
    branches/ge_harmony/source/blender/editors/object/object_vgroup.c
    branches/ge_harmony/source/blender/editors/physics/particle_edit.c
    branches/ge_harmony/source/blender/editors/physics/physics_fluid.c
    branches/ge_harmony/source/blender/editors/render/render_internal.c
    branches/ge_harmony/source/blender/editors/render/render_opengl.c
    branches/ge_harmony/source/blender/editors/render/render_shading.c
    branches/ge_harmony/source/blender/editors/render/render_update.c
    branches/ge_harmony/source/blender/editors/render/render_view.c
    branches/ge_harmony/source/blender/editors/screen/area.c
    branches/ge_harmony/source/blender/editors/screen/glutil.c
    branches/ge_harmony/source/blender/editors/screen/screen_edit.c
    branches/ge_harmony/source/blender/editors/screen/screen_intern.h
    branches/ge_harmony/source/blender/editors/screen/screen_ops.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_hide.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_image.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_mask.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/space_action/action_edit.c
    branches/ge_harmony/source/blender/editors/space_buttons/buttons_context.c
    branches/ge_harmony/source/blender/editors/space_buttons/space_buttons.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/fsmenu.c
    branches/ge_harmony/source/blender/editors/space_file/space_file.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_buttons.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_draw.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_edit.c
    branches/ge_harmony/source/blender/editors/space_graph/graph_ops.c
    branches/ge_harmony/source/blender/editors/space_image/image_edit.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/info_draw.c
    branches/ge_harmony/source/blender/editors/space_info/info_ops.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_info/textview.h
    branches/ge_harmony/source/blender/editors/space_logic/logic_window.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_draw.c
    branches/ge_harmony/source/blender/editors/space_node/CMakeLists.txt
    branches/ge_harmony/source/blender/editors/space_node/drawnode.c
    branches/ge_harmony/source/blender/editors/space_node/node_add.c
    branches/ge_harmony/source/blender/editors/space_node/node_draw.c
    branches/ge_harmony/source/blender/editors/space_node/node_edit.c
    branches/ge_harmony/source/blender/editors/space_node/node_intern.h
    branches/ge_harmony/source/blender/editors/space_node/node_ops.c
    branches/ge_harmony/source/blender/editors/space_node/node_templates.c
    branches/ge_harmony/source/blender/editors/space_node/space_node.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_draw.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_edit.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_select.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_tree.c
    branches/ge_harmony/source/blender/editors/space_outliner/space_outliner.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_edit.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_intern.h
    branches/ge_harmony/source/blender/editors/space_text/text_ops.c
    branches/ge_harmony/source/blender/editors/space_text/text_python.c
    branches/ge_harmony/source/blender/editors/space_view3d/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/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_intern.h
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_iterators.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_ops.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_project.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_select.c
    branches/ge_harmony/source/blender/editors/space_view3d/view3d_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.h
    branches/ge_harmony/source/blender/editors/transform/transform_constraints.c
    branches/ge_harmony/source/blender/editors/transform/transform_conversions.c
    branches/ge_harmony/source/blender/editors/transform/transform_input.c
    branches/ge_harmony/source/blender/editors/transform/transform_manipulator.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/numinput.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_smart_stitch.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/ge_harmony/source/blender/gpu/GPU_draw.h
    branches/ge_harmony/source/blender/gpu/GPU_material.h
    branches/ge_harmony/source/blender/gpu/intern/gpu_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_vertex.glsl
    branches/ge_harmony/source/blender/ikplugin/intern/ikplugin_api.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/IMB_imbuf.h
    branches/ge_harmony/source/blender/imbuf/intern/anim_movie.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/cineonlib.c
    branches/ge_harmony/source/blender/imbuf/intern/divers.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/openexr/CMakeLists.txt
    branches/ge_harmony/source/blender/imbuf/intern/util.c
    branches/ge_harmony/source/blender/makesdna/DNA_action_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_modifier_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_node_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_particle_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_scene_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_screen_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_space_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_text_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_tracking_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_userdef_types.h
    branches/ge_harmony/source/blender/makesdna/intern/makesdna.c
    branches/ge_harmony/source/blender/makesrna/RNA_access.h
    branches/ge_harmony/source/blender/makesrna/intern/makesrna.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_access.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_action.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_actuator.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_constraint.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_lamp.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_mesh.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_modifier.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_object.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_particle.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_pose.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_scene.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_scene_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sequencer.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_space.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_speaker.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_text.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_texture.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_userdef.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_wm.c
    branches/ge_harmony/source/blender/makesrna/rna_cleanup/rna_cleaner.py
    branches/ge_harmony/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
    branches/ge_harmony/source/blender/modifiers/CMakeLists.txt
    branches/ge_harmony/source/blender/modifiers/MOD_modifiertypes.h
    branches/ge_harmony/source/blender/modifiers/intern/MOD_array.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_decimate.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_skin.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_solidify.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_util.c
    branches/ge_harmony/source/blender/nodes/CMakeLists.txt
    branches/ge_harmony/source/blender/nodes/NOD_composite.h
    branches/ge_harmony/source/blender/nodes/NOD_shader.h
    branches/ge_harmony/source/blender/nodes/NOD_texture.h
    branches/ge_harmony/source/blender/nodes/composite/node_composite_tree.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/ge_harmony/source/blender/nodes/intern/node_socket.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_normal.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_normal_map.c
    branches/ge_harmony/source/blender/python/bmesh/CMakeLists.txt
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_api.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_ops.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types.h
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types_customdata.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types_select.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_utils.c
    branches/ge_harmony/source/blender/python/intern/bpy.c
    branches/ge_harmony/source/blender/python/intern/bpy_interface.c
    branches/ge_harmony/source/blender/python/intern/bpy_traceback.c
    branches/ge_harmony/source/blender/python/intern/bpy_util.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_Euler.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Matrix.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_Vector.c
    branches/ge_harmony/source/blender/python/mathutils/mathutils_geometry.c
    branches/ge_harmony/source/blender/quicktime/apple/qtkit_export.m
    branches/ge_harmony/source/blender/quicktime/quicktime_export.h
    branches/ge_harmony/source/blender/render/extern/include/RE_pipeline.h
    branches/ge_harmony/source/blender/render/intern/include/pixelblending.h
    branches/ge_harmony/source/blender/render/intern/include/rayobject.h
    branches/ge_harmony/source/blender/render/intern/include/renderdatabase.h
    branches/ge_harmony/source/blender/render/intern/include/strand.h
    branches/ge_harmony/source/blender/render/intern/include/zbuf.h
    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/source/convertblender.c
    branches/ge_harmony/source/blender/render/intern/source/envmap.c
    branches/ge_harmony/source/blender/render/intern/source/initrender.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/renderdatabase.c
    branches/ge_harmony/source/blender/render/intern/source/shadbuf.c
    branches/ge_harmony/source/blender/render/intern/source/shadeoutput.c
    branches/ge_harmony/source/blender/render/intern/source/strand.c
    branches/ge_harmony/source/blender/render/intern/source/zbuf.c
    branches/ge_harmony/source/blender/windowmanager/WM_api.h
    branches/ge_harmony/source/blender/windowmanager/WM_types.h
    branches/ge_harmony/source/blender/windowmanager/intern/wm_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_playanim.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_subwindow.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_window.c
    branches/ge_harmony/source/blender/windowmanager/wm_event_system.h
    branches/ge_harmony/source/blender/windowmanager/wm_event_types.h
    branches/ge_harmony/source/blender/windowmanager/wm_files.h
    branches/ge_harmony/source/blender/windowmanager/wm_subwindow.h
    branches/ge_harmony/source/blender/windowmanager/wm_window.h
    branches/ge_harmony/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/ge_harmony/source/creator/CMakeLists.txt
    branches/ge_harmony/source/creator/blender.map
    branches/ge_harmony/source/creator/creator.c
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.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_ghost.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/ge_harmony/source/tests/bl_run_operators.py
    branches/ge_harmony/source/tools/check_style_c.py
    branches/ge_harmony/source/tools/spell_check_source.py
    branches/ge_harmony/source/tools/tag_release.py

Added Paths:
-----------
    branches/ge_harmony/doc/python_api/examples/bmesh.ops.1.py
    branches/ge_harmony/doc/python_api/rst/info_api_reference.rst
    branches/ge_harmony/doc/python_api/rst/info_tutorial_addon.rst
    branches/ge_harmony/doc/python_api/rst_from_bmesh_opdefines.py
    branches/ge_harmony/extern/bullet2/src/BulletCollision/Gimpact/btCompoundFromGimpact.h
    branches/ge_harmony/intern/audaspace/FX/AUD_BandpassCalculator.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_BandpassCalculator.h
    branches/ge_harmony/intern/audaspace/FX/AUD_ButterworthCalculator.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_ButterworthCalculator.h
    branches/ge_harmony/intern/audaspace/FX/AUD_HighpassCalculator.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_HighpassCalculator.h
    branches/ge_harmony/intern/audaspace/FX/AUD_LowpassCalculator.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_LowpassCalculator.h
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf_util.h
    branches/ge_harmony/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
    branches/ge_harmony/intern/cycles/kernel/shaders/node_convert_from_string.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_rgb_curves.osl
    branches/ge_harmony/intern/cycles/kernel/shaders/node_vector_curves.osl
    branches/ge_harmony/release/datafiles/blender_icons.sh
    branches/ge_harmony/release/datafiles/blender_icons.svg
    branches/ge_harmony/release/datafiles/prvicons.sh
    branches/ge_harmony/release/datafiles/prvicons.svg
    branches/ge_harmony/release/datafiles/splash_template.xcf
    branches/ge_harmony/release/scripts/templates/bmesh_simple_editmode.py
    branches/ge_harmony/source/blender/blenkernel/BKE_bpath.h
    branches/ge_harmony/source/blender/blenkernel/BKE_pbvh.h
    branches/ge_harmony/source/blender/blenkernel/intern/bpath.c
    branches/ge_harmony/source/blender/blenkernel/intern/pbvh.c
    branches/ge_harmony/source/blender/bmesh/tools/bmesh_edgesplit.c
    branches/ge_harmony/source/blender/bmesh/tools/bmesh_edgesplit.h
    branches/ge_harmony/source/blender/editors/space_node/node_toolbar.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_uvwarp.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_ops_call.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_ops_call.h
    branches/ge_harmony/source/creator/osx_locals.map

Removed Paths:
-------------
    branches/ge_harmony/extern/eltopo/
    branches/ge_harmony/intern/cycles/blender/addon/enums.py
    branches/ge_harmony/intern/cycles/kernel/svm/svm_bsdf.h
    branches/ge_harmony/source/blender/blenlib/BLI_bpath.h
    branches/ge_harmony/source/blender/blenlib/BLI_pbvh.h
    branches/ge_harmony/source/blender/blenlib/intern/bpath.c
    branches/ge_harmony/source/blender/blenlib/intern/pbvh.c

Property Changed:
----------------
    branches/ge_harmony/
    branches/ge_harmony/source/blender/editors/interface/interface.c
    branches/ge_harmony/source/blender/editors/space_outliner/


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

Modified: branches/ge_harmony/CMakeLists.txt
===================================================================
--- branches/ge_harmony/CMakeLists.txt	2012-12-20 19:40:30 UTC (rev 53220)
+++ branches/ge_harmony/CMakeLists.txt	2012-12-20 21:58:59 UTC (rev 53221)
@@ -127,7 +127,7 @@
 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_IK_SOLVER     "Enable Legacy IK solver (only disable for development)" ON)
-option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
+option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" ON)
 option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 option(WITH_GAMEENGINE    "Enable Game Engine" ON)
 option(WITH_PLAYER        "Build Player" OFF)
@@ -190,8 +190,8 @@
 option(WITH_MOD_SMOKE           "Enable Smoke Modifier (Smoke Simulation)" ON)
 option(WITH_MOD_BOOLEAN         "Enable Boolean Modifier" ON)
 option(WITH_MOD_REMESH          "Enable Remesh Modifier" ON)
-option(WITH_MOD_CLOTH_ELTOPO    "Enable Experimental cloth solver" OFF)
-mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
+# option(WITH_MOD_CLOTH_ELTOPO    "Enable Experimental cloth solver" OFF)  # this is now only available in a branch
+# mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
 option(WITH_MOD_OCEANSIM        "Enable Ocean Modifier" OFF)
 
 # Image format support
@@ -241,11 +241,6 @@
 set(PYTHON_NUMPY_PATH            "" CACHE PATH "Python to python site-packages or dist-packages containing 'numpy' module")
 mark_as_advanced(PYTHON_NUMPY_PATH)
 
-if(MINGW)
-	option(WITH_MINGW64                   "Use the 64-bit version of MinGW" OFF)
-	mark_as_advanced(WITH_MINGW64)
-endif()
-
 # Cycles
 option(WITH_CYCLES					"Enable cycles Render Engine" ON)
 option(WITH_CYCLES_TEST				"Build cycles test application" OFF)
@@ -271,6 +266,9 @@
 
 
 if(APPLE)
+	cmake_minimum_required(VERSION 2.8.8)
+	cmake_policy(VERSION 2.8.8)
+
 	if(NOT CMAKE_OSX_ARCHITECTURES)
 		set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
 		"Choose the architecture you want to build Blender for: i386, x86_64 or ppc"
@@ -384,10 +382,6 @@
 endif()
 
 
-if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
-	message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON")
-endif()
-
 # may as well build python module without a UI
 if(WITH_PYTHON_MODULE)
 	set(WITH_HEADLESS ON)
@@ -487,14 +481,14 @@
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
 # On Unix:
 #   cmake ../blender \
-#         -D PYTHON_VERSION=3.2 \
-#         -D PYTHON_INCLUDE_DIR=/opt/py32/include/python3.2d \
-#         -D PYTHON_LIBRARY=/opt/py32/lib/libpython3.2d.so
+#         -D PYTHON_VERSION=3.3 \
+#         -D PYTHON_INCLUDE_DIR=/opt/py33/include/python3.3d \
+#         -D PYTHON_LIBRARY=/opt/py33/lib/libpython3.3d.so
 #
 # On Macs:
 #   cmake ../blender \
-#         -D PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2 \
-#         -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.2/lib/python3.2/config \
+#         -D PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.3/include/python3.3 \
+#         -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/config \
 #         -G Xcode
 #
 # When changing any of this remember to update the notes in doc/build_systems/cmake.txt
@@ -522,7 +516,7 @@
 	find_package_wrapper(Freetype REQUIRED)
 
 	if(WITH_PYTHON)
-		# No way to set py32. remove for now.
+		# No way to set py33. remove for now.
 		# find_package(PythonLibs)
 
 		# Use our own instead, since wothout py is such a rare case,
@@ -650,20 +644,15 @@
 	if(WITH_BOOST)
 		# uses in build instructions to override include and library variables
 		if(NOT BOOST_CUSTOM)
-			# XXX No more lib dir, is this multithread stuff still needed?
 			if(${WITH_STATIC_LIBS})
 				set(Boost_USE_STATIC_LIBS ON)
 			endif()
-			if(NOT BOOST_ROOT)
-				set(Boost_USE_MULTITHREADED OFF)
-			else()
-				set(Boost_USE_MULTITHREADED ON)
-			endif()
+			set(Boost_USE_MULTITHREADED ON)
 			set(__boost_packages filesystem regex system thread date_time)
 			if (WITH_INTERNATIONAL)
 				list(APPEND __boost_packages locale)
 			endif()
-			find_package(Boost 1.34 COMPONENTS ${__boost_packages})
+			find_package(Boost 1.48 COMPONENTS ${__boost_packages})
 			if(Boost_USE_STATIC_LIBS AND Boost_USE_ICU)
 				find_package(IcuLinux)
 			endif()
@@ -755,7 +744,6 @@
 				                OUTPUT_STRIP_TRAILING_WHITESPACE)
 				string(REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY})
 			endif()
-			message(STATUS "LLVM library  = ${LLVM_LIBRARY}")
 		else()
 			message(FATAL_ERROR "LLVM not found.")
 		endif()
@@ -869,10 +857,18 @@
 
 	if(CMAKE_COMPILER_IS_GNUCC)
 		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
-
+		INCLUDE (CheckCSourceCompiles) 
 		# Setup 64bit and 64bit windows systems
+		CHECK_C_SOURCE_COMPILES("
+			#ifndef __MINGW64__
+			#error
+			#endif
+			main(){}
+			" 
+			WITH_MINGW64)
+		
 		if(WITH_MINGW64)
-			message("Set 64 bit compiler for MinGW.")
+			message("Compiling for 64 bit with MinGW-w64.")
 			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
 		endif()
 	else()
@@ -928,8 +924,6 @@
 	if(WITH_CYCLES_OSL)
 		set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
 	
-		message(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
-	
 		find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
 		find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
 		find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
@@ -939,21 +933,11 @@
 	
 		if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
 			set(OSL_FOUND TRUE)
-			message(STATUS "OSL includes = ${OSL_INCLUDES}")
-			message(STATUS "OSL library = ${OSL_LIBRARIES}")
-			message(STATUS "OSL compiler = ${OSL_COMPILER}")
 		else()
 			message(STATUS "OSL not found")
 		endif()
 	endif()
 
-	if(WITH_LLVM)
-		set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH	"Path to the LLVM installation")
-		file(GLOB LLVM_LIBRARY ${LLVM_DIRECTORY}/lib/*.lib)
-		set(LLVM_STATIC YES)
-	endif()
-
-
 	if(MSVC)
 		set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid psapi)
 
@@ -1102,9 +1086,17 @@
 
 		if(WITH_PYTHON)
 			# normally cached but not since we include them with blender
-			set(PYTHON_VERSION 3.2) # CACHE STRING)
+			if(MSVC10)
+				set(PYTHON_VERSION 3.2) # CACHE STRING)
+			else()
+				set(PYTHON_VERSION 3.3) # CACHE STRING)
+			endif()
+
 			set_lib_path(PYTHON "python")
-			set(PYTHON_LIBRARY ${PYTHON}/lib/python32.lib) #CACHE FILEPATH
+			STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
+			set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
+			unset(_PYTHON_VERSION_NO_DOTS)
+
 			#Shared includes for both vc2008 and vc2010
 			set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/include/python${PYTHON_VERSION})
 
@@ -1148,6 +1140,12 @@
 			set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
 		endif()
 
+		if(WITH_LLVM)
+			set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH	"Path to the LLVM installation")
+			file(GLOB LLVM_LIBRARY ${LLVM_DIRECTORY}/lib/*.lib)
+			set(LLVM_STATIC YES)
+		endif()
+	
 		if(WITH_OPENCOLORIO)
 			set(OPENCOLORIO ${LIBDIR}/opencolorio)
 			set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
@@ -1212,7 +1210,7 @@
 		#comes with own pthread library
 		if(NOT WITH_MINGW64)
 			set(PTHREADS ${LIBDIR}/pthreads)
-			set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
+			#set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
 			set(PTHREADS_LIBPATH ${PTHREADS}/lib)
 			set(PTHREADS_LIBRARIES pthreadGC2)
 		endif()
@@ -1260,6 +1258,7 @@
 
 		if(WITH_IMAGE_OPENEXR)
 			set(OPENEXR ${LIBDIR}/openexr)
+			set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
 			set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
 			set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
 			set(OPENEXR_LIBPATH ${OPENEXR}/lib)
@@ -1284,9 +1283,9 @@
 
 		if(WITH_PYTHON)
 			# normally cached but not since we include them with blender
-			set(PYTHON_VERSION 3.2) #  CACHE STRING)
+			set(PYTHON_VERSION 3.3) #  CACHE STRING)
 			set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")  # CACHE PATH)
-			set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python32mw.lib")  # CACHE FILEPATH)
+			set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python33mw.lib")  # CACHE FILEPATH)
 
 			# uncached vars
 			set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
@@ -1327,6 +1326,34 @@
 			set(OPENIMAGEIO_DEFINITIONS)
 		endif()
 		
+		if(WITH_LLVM)
+			set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH	"Path to the LLVM installation")
+			set(LLVM_LIB_DIR ${LLVM_DIRECTORY}/lib)
+			#Explicitly set llvm lib order.

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list