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

Daniel Stokes kupomail at gmail.com
Fri Nov 23 05:55:43 CET 2012


Revision: 52500
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52500
Author:   kupoman
Date:     2012-11-23 04:55:38 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Merged revisions 50954-51750 from trunk/blender

Modified Paths:
--------------
    branches/ge_harmony/CMakeLists.txt
    branches/ge_harmony/GNUmakefile
    branches/ge_harmony/SConstruct
    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/buildbot/master.cfg
    branches/ge_harmony/build_files/cmake/Modules/FindOpenColorIO.cmake
    branches/ge_harmony/build_files/cmake/Modules/FindOpenImageIO.cmake
    branches/ge_harmony/build_files/cmake/Modules/FindPythonLibsUnix.cmake
    branches/ge_harmony/build_files/cmake/cmake_consistency_check.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/macros.cmake
    branches/ge_harmony/build_files/scons/config/Modules/FindPython.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/python_api/rst/bge.constraints.rst
    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/bgl.rst
    branches/ge_harmony/doc/python_api/rst/gpu.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/lib/intersect_face_division.cpp
    branches/ge_harmony/extern/glew/src/glew.c
    branches/ge_harmony/extern/libmv/libmv/multiview/euclidean_resection.cc
    branches/ge_harmony/extern/libmv/libmv/multiview/euclidean_resection.h
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/pipeline.h
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/reconstruction.h
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/resect.cc
    branches/ge_harmony/extern/libmv/libmv/simple_pipeline/resect.h
    branches/ge_harmony/extern/libmv/libmv-capi.cpp
    branches/ge_harmony/extern/libmv/libmv-capi.h
    branches/ge_harmony/extern/xdnd/xdnd.c
    branches/ge_harmony/intern/CMakeLists.txt
    branches/ge_harmony/intern/SConscript
    branches/ge_harmony/intern/audaspace/CMakeLists.txt
    branches/ge_harmony/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_AccumulatorFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
    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_CallbackIIRFilterReader.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
    branches/ge_harmony/intern/audaspace/FX/AUD_DelayFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_DelayFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_DelayReader.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_DelayReader.h
    branches/ge_harmony/intern/audaspace/FX/AUD_DoubleFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_DoubleFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_DoubleReader.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_DoubleReader.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_DynamicIIRFilterReader.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
    branches/ge_harmony/intern/audaspace/FX/AUD_EffectFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_EffectFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_EffectReader.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_EffectReader.h
    branches/ge_harmony/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_EnvelopeFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_FaderFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_FaderFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_FaderReader.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_FaderReader.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_IIRFilterFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_IIRFilterFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_IIRFilterReader.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_IIRFilterReader.h
    branches/ge_harmony/intern/audaspace/FX/AUD_LimiterFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_LimiterFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_LimiterReader.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_LimiterReader.h
    branches/ge_harmony/intern/audaspace/FX/AUD_LoopFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_LoopFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_LoopReader.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_LoopReader.h
    branches/ge_harmony/intern/audaspace/FX/AUD_LowpassFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_LowpassFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_PingPongFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_PingPongFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_PitchFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_PitchFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_PitchReader.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_PitchReader.h
    branches/ge_harmony/intern/audaspace/FX/AUD_RectifyFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_RectifyFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_ReverseFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_ReverseFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_ReverseReader.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_ReverseReader.h
    branches/ge_harmony/intern/audaspace/FX/AUD_SquareFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_SquareFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_SumFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_SumFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_SuperposeFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_SuperposeFactory.h
    branches/ge_harmony/intern/audaspace/FX/AUD_SuperposeReader.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_SuperposeReader.h
    branches/ge_harmony/intern/audaspace/FX/AUD_VolumeFactory.cpp
    branches/ge_harmony/intern/audaspace/FX/AUD_VolumeFactory.h
    branches/ge_harmony/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/ge_harmony/intern/audaspace/OpenAL/AUD_OpenALDevice.h
    branches/ge_harmony/intern/audaspace/Python/AUD_PyAPI.cpp
    branches/ge_harmony/intern/audaspace/SConscript
    branches/ge_harmony/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
    branches/ge_harmony/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
    branches/ge_harmony/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/ge_harmony/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
    branches/ge_harmony/intern/audaspace/intern/AUD_BufferReader.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_BufferReader.h
    branches/ge_harmony/intern/audaspace/intern/AUD_C-API.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_C-API.h
    branches/ge_harmony/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_ChannelMapperFactory.h
    branches/ge_harmony/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_ChannelMapperReader.h
    branches/ge_harmony/intern/audaspace/intern/AUD_ConverterFactory.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_ConverterFactory.h
    branches/ge_harmony/intern/audaspace/intern/AUD_ConverterReader.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_ConverterReader.h
    branches/ge_harmony/intern/audaspace/intern/AUD_FileFactory.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_FileFactory.h
    branches/ge_harmony/intern/audaspace/intern/AUD_FileWriter.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_FileWriter.h
    branches/ge_harmony/intern/audaspace/intern/AUD_IDevice.h
    branches/ge_harmony/intern/audaspace/intern/AUD_IFactory.h
    branches/ge_harmony/intern/audaspace/intern/AUD_JOSResampleFactory.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_JOSResampleFactory.h
    branches/ge_harmony/intern/audaspace/intern/AUD_JOSResampleReader.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_JOSResampleReader.h
    branches/ge_harmony/intern/audaspace/intern/AUD_LinearResampleFactory.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_LinearResampleFactory.h
    branches/ge_harmony/intern/audaspace/intern/AUD_LinearResampleReader.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_LinearResampleReader.h
    branches/ge_harmony/intern/audaspace/intern/AUD_Mixer.h
    branches/ge_harmony/intern/audaspace/intern/AUD_MixerFactory.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_MixerFactory.h
    branches/ge_harmony/intern/audaspace/intern/AUD_NULLDevice.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_NULLDevice.h
    branches/ge_harmony/intern/audaspace/intern/AUD_ResampleReader.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_ResampleReader.h
    branches/ge_harmony/intern/audaspace/intern/AUD_SequencerEntry.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_SequencerEntry.h
    branches/ge_harmony/intern/audaspace/intern/AUD_SequencerFactory.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_SequencerFactory.h
    branches/ge_harmony/intern/audaspace/intern/AUD_SequencerHandle.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_SequencerHandle.h
    branches/ge_harmony/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_SequencerReader.h
    branches/ge_harmony/intern/audaspace/intern/AUD_SilenceFactory.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_SilenceFactory.h
    branches/ge_harmony/intern/audaspace/intern/AUD_SinusFactory.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_SinusFactory.h
    branches/ge_harmony/intern/audaspace/intern/AUD_SoftwareDevice.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_SoftwareDevice.h
    branches/ge_harmony/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_StreamBufferFactory.h
    branches/ge_harmony/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
    branches/ge_harmony/intern/audaspace/sndfile/AUD_SndFileFactory.h
    branches/ge_harmony/intern/audaspace/sndfile/AUD_SndFileReader.cpp
    branches/ge_harmony/intern/audaspace/sndfile/AUD_SndFileReader.h
    branches/ge_harmony/intern/bsp/extern/CSG_BooleanOps.h
    branches/ge_harmony/intern/bsp/intern/BOP_CarveInterface.cpp
    branches/ge_harmony/intern/container/CMakeLists.txt
    branches/ge_harmony/intern/container/CTR_HashedPtr.h
    branches/ge_harmony/intern/cycles/CMakeLists.txt
    branches/ge_harmony/intern/cycles/SConscript
    branches/ge_harmony/intern/cycles/app/CMakeLists.txt
    branches/ge_harmony/intern/cycles/app/cycles_test.cpp
    branches/ge_harmony/intern/cycles/blender/CCL_api.h
    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/enums.py
    branches/ge_harmony/intern/cycles/blender/addon/ui.py
    branches/ge_harmony/intern/cycles/blender/blender_camera.cpp
    branches/ge_harmony/intern/cycles/blender/blender_mesh.cpp
    branches/ge_harmony/intern/cycles/blender/blender_object.cpp
    branches/ge_harmony/intern/cycles/blender/blender_particles.cpp
    branches/ge_harmony/intern/cycles/blender/blender_python.cpp
    branches/ge_harmony/intern/cycles/blender/blender_session.cpp
    branches/ge_harmony/intern/cycles/blender/blender_session.h
    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/cmake/external_libs.cmake
    branches/ge_harmony/intern/cycles/device/device.cpp
    branches/ge_harmony/intern/cycles/device/device.h
    branches/ge_harmony/intern/cycles/device/device_cpu.cpp
    branches/ge_harmony/intern/cycles/device/device_cuda.cpp
    branches/ge_harmony/intern/cycles/device/device_intern.h
    branches/ge_harmony/intern/cycles/device/device_multi.cpp
    branches/ge_harmony/intern/cycles/device/device_network.cpp
    branches/ge_harmony/intern/cycles/device/device_opencl.cpp
    branches/ge_harmony/intern/cycles/device/device_task.cpp
    branches/ge_harmony/intern/cycles/kernel/CMakeLists.txt
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf_microfacet.h
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf_ward.h
    branches/ge_harmony/intern/cycles/kernel/kernel_accumulate.h
    branches/ge_harmony/intern/cycles/kernel/kernel_camera.h
    branches/ge_harmony/intern/cycles/kernel/kernel_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_projection.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/background.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/svm/svm.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_bsdf.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_closure.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_geometry.h
    branches/ge_harmony/intern/cycles/kernel/svm/svm_image.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/attribute.cpp
    branches/ge_harmony/intern/cycles/render/buffers.cpp
    branches/ge_harmony/intern/cycles/render/camera.cpp
    branches/ge_harmony/intern/cycles/render/camera.h
    branches/ge_harmony/intern/cycles/render/graph.cpp
    branches/ge_harmony/intern/cycles/render/graph.h
    branches/ge_harmony/intern/cycles/render/image.cpp
    branches/ge_harmony/intern/cycles/render/image.h
    branches/ge_harmony/intern/cycles/render/light.cpp
    branches/ge_harmony/intern/cycles/render/mesh.cpp
    branches/ge_harmony/intern/cycles/render/nodes.cpp
    branches/ge_harmony/intern/cycles/render/nodes.h
    branches/ge_harmony/intern/cycles/render/osl.cpp
    branches/ge_harmony/intern/cycles/render/osl.h
    branches/ge_harmony/intern/cycles/render/particles.cpp
    branches/ge_harmony/intern/cycles/render/scene.cpp
    branches/ge_harmony/intern/cycles/render/scene.h
    branches/ge_harmony/intern/cycles/render/session.cpp
    branches/ge_harmony/intern/cycles/render/session.h
    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/tile.cpp
    branches/ge_harmony/intern/cycles/util/util_attribute.cpp
    branches/ge_harmony/intern/cycles/util/util_boundbox.h
    branches/ge_harmony/intern/cycles/util/util_math.h
    branches/ge_harmony/intern/cycles/util/util_md5.h
    branches/ge_harmony/intern/cycles/util/util_opencl.cpp
    branches/ge_harmony/intern/cycles/util/util_path.cpp
    branches/ge_harmony/intern/cycles/util/util_path.h
    branches/ge_harmony/intern/cycles/util/util_progress.h
    branches/ge_harmony/intern/cycles/util/util_task.cpp
    branches/ge_harmony/intern/cycles/util/util_task.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/ffmpeg/ffmpeg_compat.h
    branches/ge_harmony/intern/ghost/CMakeLists.txt
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/ge_harmony/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/ge_harmony/intern/guardedalloc/cpp/mallocn.cpp
    branches/ge_harmony/intern/itasc/CMakeLists.txt
    branches/ge_harmony/intern/itasc/kdl/chain.hpp
    branches/ge_harmony/intern/itasc/kdl/tree.hpp
    branches/ge_harmony/intern/memutil/MEM_SmartPtr.h
    branches/ge_harmony/intern/opencolorio/ocio_impl.cc
    branches/ge_harmony/intern/smoke/intern/smoke_API.cpp
    branches/ge_harmony/intern/utfconv/utfconv.h
    branches/ge_harmony/release/datafiles/blender_icons.png
    branches/ge_harmony/release/datafiles/prvicons.png
    branches/ge_harmony/release/datafiles/startup.blend
    branches/ge_harmony/release/scripts/modules/addon_utils.py
    branches/ge_harmony/release/scripts/modules/bl_i18n_utils/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_languages_menu.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/startup/bl_operators/object.py
    branches/ge_harmony/release/scripts/startup/bl_operators/presets.py
    branches/ge_harmony/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
    branches/ge_harmony/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/ge_harmony/release/scripts/startup/bl_operators/wm.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_game.py
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_render.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_logic.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_node.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_sequencer.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_text.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_time.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_userpref.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d.py
    branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/ge_harmony/release/scripts/templates/script_stub.py
    branches/ge_harmony/release/text/readme.html
    branches/ge_harmony/source/blender/avi/intern/avi.c
    branches/ge_harmony/source/blender/avi/intern/avi_rgb.c
    branches/ge_harmony/source/blender/blenfont/BLF_translation.h
    branches/ge_harmony/source/blender/blenfont/CMakeLists.txt
    branches/ge_harmony/source/blender/blenfont/SConscript
    branches/ge_harmony/source/blender/blenfont/intern/blf.c
    branches/ge_harmony/source/blender/blenfont/intern/blf_lang.c
    branches/ge_harmony/source/blender/blenfont/intern/blf_translation.c
    branches/ge_harmony/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/ge_harmony/source/blender/blenkernel/BKE_blender.h
    branches/ge_harmony/source/blender/blenkernel/BKE_colortools.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_idprop.h
    branches/ge_harmony/source/blender/blenkernel/BKE_image.h
    branches/ge_harmony/source/blender/blenkernel/BKE_lamp.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_multires.h
    branches/ge_harmony/source/blender/blenkernel/BKE_node.h
    branches/ge_harmony/source/blender/blenkernel/BKE_sequencer.h
    branches/ge_harmony/source/blender/blenkernel/BKE_subsurf.h
    branches/ge_harmony/source/blender/blenkernel/BKE_text.h
    branches/ge_harmony/source/blender/blenkernel/BKE_tracking.h
    branches/ge_harmony/source/blender/blenkernel/BKE_utildefines.h
    branches/ge_harmony/source/blender/blenkernel/SConscript
    branches/ge_harmony/source/blender/blenkernel/intern/DerivedMesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/anim.c
    branches/ge_harmony/source/blender/blenkernel/intern/anim_sys.c
    branches/ge_harmony/source/blender/blenkernel/intern/blender.c
    branches/ge_harmony/source/blender/blenkernel/intern/bmfont.c
    branches/ge_harmony/source/blender/blenkernel/intern/brush.c
    branches/ge_harmony/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/collision.c
    branches/ge_harmony/source/blender/blenkernel/intern/colortools.c
    branches/ge_harmony/source/blender/blenkernel/intern/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/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/idprop.c
    branches/ge_harmony/source/blender/blenkernel/intern/image.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/lamp.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_evaluate.c
    branches/ge_harmony/source/blender/blenkernel/intern/mask_rasterize.c
    branches/ge_harmony/source/blender/blenkernel/intern/mball.c
    branches/ge_harmony/source/blender/blenkernel/intern/mesh.c
    branches/ge_harmony/source/blender/blenkernel/intern/mesh_validate.c
    branches/ge_harmony/source/blender/blenkernel/intern/modifier.c
    branches/ge_harmony/source/blender/blenkernel/intern/movieclip.c
    branches/ge_harmony/source/blender/blenkernel/intern/multires.c
    branches/ge_harmony/source/blender/blenkernel/intern/navmesh_conversion.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/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/shrinkwrap.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/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/writeffmpeg.c
    branches/ge_harmony/source/blender/blenlib/BLI_bpath.h
    branches/ge_harmony/source/blender/blenlib/BLI_endian_switch_inline.h
    branches/ge_harmony/source/blender/blenlib/BLI_ghash.h
    branches/ge_harmony/source/blender/blenlib/BLI_math.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_geom.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_matrix.h
    branches/ge_harmony/source/blender/blenlib/BLI_math_vector.h
    branches/ge_harmony/source/blender/blenlib/BLI_pbvh.h
    branches/ge_harmony/source/blender/blenlib/BLI_quadric.h
    branches/ge_harmony/source/blender/blenlib/BLI_string.h
    branches/ge_harmony/source/blender/blenlib/BLI_string_utf8.h
    branches/ge_harmony/source/blender/blenlib/BLI_threads.h
    branches/ge_harmony/source/blender/blenlib/BLI_utildefines.h
    branches/ge_harmony/source/blender/blenlib/CMakeLists.txt
    branches/ge_harmony/source/blender/blenlib/PIL_time.h
    branches/ge_harmony/source/blender/blenlib/intern/BLI_ghash.c
    branches/ge_harmony/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/ge_harmony/source/blender/blenlib/intern/bpath.c
    branches/ge_harmony/source/blender/blenlib/intern/math_base_inline.c
    branches/ge_harmony/source/blender/blenlib/intern/math_color_inline.c
    branches/ge_harmony/source/blender/blenlib/intern/math_geom.c
    branches/ge_harmony/source/blender/blenlib/intern/math_matrix.c
    branches/ge_harmony/source/blender/blenlib/intern/math_rotation.c
    branches/ge_harmony/source/blender/blenlib/intern/math_vector.c
    branches/ge_harmony/source/blender/blenlib/intern/noise.c
    branches/ge_harmony/source/blender/blenlib/intern/pbvh.c
    branches/ge_harmony/source/blender/blenlib/intern/quadric.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/smallhash.c
    branches/ge_harmony/source/blender/blenlib/intern/string.c
    branches/ge_harmony/source/blender/blenlib/intern/string_utf8.c
    branches/ge_harmony/source/blender/blenlib/intern/threads.c
    branches/ge_harmony/source/blender/blenlib/intern/voronoi.c
    branches/ge_harmony/source/blender/blenloader/intern/readfile.c
    branches/ge_harmony/source/blender/blenloader/intern/versioning_250.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.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_core.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_interp.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_iterators.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_marking.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_mesh.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_polygon.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_private.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_queries.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_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_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_hull.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_inset.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_join_triangles.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_mesh_conv.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_mirror.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_primitive.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_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_unsubdivide.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_utils.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_wireframe.c
    branches/ge_harmony/source/blender/bmesh/tools/BME_bevel.c
    branches/ge_harmony/source/blender/collada/AnimationExporter.h
    branches/ge_harmony/source/blender/collada/AnimationImporter.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/GeometryExporter.cpp
    branches/ge_harmony/source/blender/collada/ImageExporter.cpp
    branches/ge_harmony/source/blender/collada/SceneExporter.cpp
    branches/ge_harmony/source/blender/collada/collada_internal.h
    branches/ge_harmony/source/blender/collada/collada_utils.cpp
    branches/ge_harmony/source/blender/collada/collada_utils.h
    branches/ge_harmony/source/blender/compositor/CMakeLists.txt
    branches/ge_harmony/source/blender/compositor/intern/COM_Converter.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    branches/ge_harmony/source/blender/compositor/intern/COM_NodeOperation.h
    branches/ge_harmony/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_MuteNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_NormalNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_OutputFileNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ScaleNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_ViewerNode.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_BokehBlurOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_ImageOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MovieDistortionOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_OutputFileOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_PixelateOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
    branches/ge_harmony/source/blender/compositor/operations/COM_ScaleOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_ScaleOperation.h
    branches/ge_harmony/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/ge_harmony/source/blender/datatoc/datatoc.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_filter.c
    branches/ge_harmony/source/blender/editors/animation/fmodifier_ui.c
    branches/ge_harmony/source/blender/editors/animation/keyingsets.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/curve/editcurve.c
    branches/ge_harmony/source/blender/editors/curve/editfont.c
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_edit.c
    branches/ge_harmony/source/blender/editors/gpencil/gpencil_paint.c
    branches/ge_harmony/source/blender/editors/include/ED_gpencil.h
    branches/ge_harmony/source/blender/editors/include/ED_image.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/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/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_intern.h
    branches/ge_harmony/source/blender/editors/interface/interface_layout.c
    branches/ge_harmony/source/blender/editors/interface/interface_regions.c
    branches/ge_harmony/source/blender/editors/interface/interface_templates.c
    branches/ge_harmony/source/blender/editors/interface/interface_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_draw.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_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_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/object/object_add.c
    branches/ge_harmony/source/blender/editors/object/object_bake.c
    branches/ge_harmony/source/blender/editors/object/object_edit.c
    branches/ge_harmony/source/blender/editors/object/object_modifier.c
    branches/ge_harmony/source/blender/editors/object/object_relations.c
    branches/ge_harmony/source/blender/editors/object/object_transform.c
    branches/ge_harmony/source/blender/editors/object/object_vgroup.c
    branches/ge_harmony/source/blender/editors/physics/particle_edit.c
    branches/ge_harmony/source/blender/editors/physics/physics_fluid.c
    branches/ge_harmony/source/blender/editors/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_update.c
    branches/ge_harmony/source/blender/editors/screen/screen_ops.c
    branches/ge_harmony/source/blender/editors/screen/screendump.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_image.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_utils.c
    branches/ge_harmony/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/ge_harmony/source/blender/editors/space_buttons/buttons_context.c
    branches/ge_harmony/source/blender/editors/space_buttons/buttons_texture.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_draw.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_editor.c
    branches/ge_harmony/source/blender/editors/space_clip/clip_ops.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_ops.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_graph/graph_buttons.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_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_ops.c
    branches/ge_harmony/source/blender/editors/space_info/space_info.c
    branches/ge_harmony/source/blender/editors/space_logic/logic_window.c
    branches/ge_harmony/source/blender/editors/space_logic/space_logic.c
    branches/ge_harmony/source/blender/editors/space_nla/nla_draw.c
    branches/ge_harmony/source/blender/editors/space_node/drawnode.c
    branches/ge_harmony/source/blender/editors/space_node/node_add.c
    branches/ge_harmony/source/blender/editors/space_node/node_draw.c
    branches/ge_harmony/source/blender/editors/space_node/node_edit.c
    branches/ge_harmony/source/blender/editors/space_node/node_group.c
    branches/ge_harmony/source/blender/editors/space_node/node_intern.h
    branches/ge_harmony/source/blender/editors/space_node/node_ops.c
    branches/ge_harmony/source/blender/editors/space_node/node_templates.c
    branches/ge_harmony/source/blender/editors/space_node/node_view.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_draw.c
    branches/ge_harmony/source/blender/editors/space_outliner/outliner_tools.c
    branches/ge_harmony/source/blender/editors/space_sequencer/SConscript
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_add.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_select.c
    branches/ge_harmony/source/blender/editors/space_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_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_header.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_view.c
    branches/ge_harmony/source/blender/editors/transform/transform.c
    branches/ge_harmony/source/blender/editors/transform/transform.h
    branches/ge_harmony/source/blender/editors/transform/transform_conversions.c
    branches/ge_harmony/source/blender/editors/transform/transform_generics.c
    branches/ge_harmony/source/blender/editors/transform/transform_manipulator.c
    branches/ge_harmony/source/blender/editors/transform/transform_snap.c
    branches/ge_harmony/source/blender/editors/util/crazyspace.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_buttons.c
    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_smart_stitch.c
    branches/ge_harmony/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/ge_harmony/source/blender/gpu/GPU_buffers.h
    branches/ge_harmony/source/blender/gpu/GPU_material.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/ikplugin/intern/ikplugin_api.c
    branches/ge_harmony/source/blender/imbuf/CMakeLists.txt
    branches/ge_harmony/source/blender/imbuf/IMB_imbuf.h
    branches/ge_harmony/source/blender/imbuf/intern/allocimbuf.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/CMakeLists.txt
    branches/ge_harmony/source/blender/imbuf/intern/cineon/cineon_dpx.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/dpxlib.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/logImageCore.c
    branches/ge_harmony/source/blender/imbuf/intern/colormanagement.c
    branches/ge_harmony/source/blender/imbuf/intern/dds/BlockDXT.h
    branches/ge_harmony/source/blender/imbuf/intern/dds/CMakeLists.txt
    branches/ge_harmony/source/blender/imbuf/intern/dds/Common.h
    branches/ge_harmony/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/ge_harmony/source/blender/imbuf/intern/dds/DirectDrawSurface.h
    branches/ge_harmony/source/blender/imbuf/intern/dds/FlipDXT.cpp
    branches/ge_harmony/source/blender/imbuf/intern/dds/SConscript
    branches/ge_harmony/source/blender/imbuf/intern/dds/Stream.h
    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/jp2.c
    branches/ge_harmony/source/blender/imbuf/intern/jpeg.c
    branches/ge_harmony/source/blender/imbuf/intern/openexr/CMakeLists.txt
    branches/ge_harmony/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/ge_harmony/source/blender/imbuf/intern/openexr/openexr_multi.h
    branches/ge_harmony/source/blender/imbuf/intern/openexr/openexr_stub.cpp
    branches/ge_harmony/source/blender/imbuf/intern/png.c
    branches/ge_harmony/source/blender/imbuf/intern/radiance_hdr.c
    branches/ge_harmony/source/blender/imbuf/intern/readimage.c
    branches/ge_harmony/source/blender/imbuf/intern/rectop.c
    branches/ge_harmony/source/blender/imbuf/intern/scaling.c
    branches/ge_harmony/source/blender/imbuf/intern/thumbs.c
    branches/ge_harmony/source/blender/imbuf/intern/util.c
    branches/ge_harmony/source/blender/makesdna/DNA_curve_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_customdata_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_gpencil_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_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_scene_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_sequence_types.h
    branches/ge_harmony/source/blender/makesdna/DNA_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/RNA_types.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_animation.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_armature.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_boid.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_brush.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_color.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_fcurve.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_gpencil.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_main.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_main_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_mask.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_material.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_mesh.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_mesh_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_meta.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_modifier.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_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_render.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_sequencer.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_space.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_tracking.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_ui_api.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_userdef.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_wm.c
    branches/ge_harmony/source/blender/makesrna/intern/rna_wm_api.c
    branches/ge_harmony/source/blender/modifiers/CMakeLists.txt
    branches/ge_harmony/source/blender/modifiers/MOD_modifiertypes.h
    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_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_explode.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_laplaciansmooth.c
    branches/ge_harmony/source/blender/modifiers/intern/MOD_ocean.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_socket.h
    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_image.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/ge_harmony/source/blender/nodes/intern/node_socket.c
    branches/ge_harmony/source/blender/nodes/shader/node_shader_tree.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bump.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_image.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_customdata.c
    branches/ge_harmony/source/blender/python/bmesh/bmesh_py_types_meshdata.c
    branches/ge_harmony/source/blender/python/generic/bgl.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_intern_string.c
    branches/ge_harmony/source/blender/python/intern/bpy_intern_string.h
    branches/ge_harmony/source/blender/python/intern/bpy_props.c
    branches/ge_harmony/source/blender/python/intern/bpy_rna.c
    branches/ge_harmony/source/blender/python/intern/bpy_rna_array.c
    branches/ge_harmony/source/blender/python/intern/bpy_util.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/quicktime/apple/qtkit_import.m
    branches/ge_harmony/source/blender/quicktime/quicktime_export.h
    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/intern/include/initrender.h
    branches/ge_harmony/source/blender/render/intern/include/render_types.h
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_internal.h
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/ge_harmony/source/blender/render/intern/raytrace/svbvh.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/pipeline.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/shadeoutput.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/voxeldata.c
    branches/ge_harmony/source/blender/render/intern/source/zbuf.c
    branches/ge_harmony/source/blender/windowmanager/WM_api.h
    branches/ge_harmony/source/blender/windowmanager/WM_keymap.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_init_exit.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_jobs.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_keymap.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_operators.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_playanim.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_subwindow.c
    branches/ge_harmony/source/blender/windowmanager/intern/wm_window.c
    branches/ge_harmony/source/blender/windowmanager/wm_event_types.h
    branches/ge_harmony/source/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/CMakeLists.txt
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/ge_harmony/source/gameengine/BlenderRoutines/SConscript
    branches/ge_harmony/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ArmatureConstraint.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/ge_harmony/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/ge_harmony/source/gameengine/Converter/CMakeLists.txt
    branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/ge_harmony/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/ge_harmony/source/gameengine/Converter/SConscript
    branches/ge_harmony/source/gameengine/Expressions/IntValue.cpp
    branches/ge_harmony/source/gameengine/Expressions/ListValue.cpp
    branches/ge_harmony/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/ge_harmony/source/gameengine/Expressions/PyObjectPlus.h
    branches/ge_harmony/source/gameengine/GameLogic/SCA_IController.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_MouseSensor.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_PythonController.h
    branches/ge_harmony/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_PythonMouse.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/ge_harmony/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/CMakeLists.txt
    branches/ge_harmony/source/gameengine/GamePlayer/common/SConscript
    branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/ge_harmony/source/gameengine/GamePlayer/ghost/SConscript
    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_Shader.h
    branches/ge_harmony/source/gameengine/Ketsji/BL_Texture.cpp
    branches/ge_harmony/source/gameengine/Ketsji/CMakeLists.txt
    branches/ge_harmony/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_BlenderMaterial.h
    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_ConstraintWrapper.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_GameObject.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_GameObject.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    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_MeshProxy.h
    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_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_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_SCA_AddObjectActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/ge_harmony/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_VertexProxy.h
    branches/ge_harmony/source/gameengine/Ketsji/SConscript
    branches/ge_harmony/source/gameengine/Network/NG_NetworkDeviceInterface.h
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/ge_harmony/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/ge_harmony/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
    branches/ge_harmony/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
    branches/ge_harmony/source/gameengine/Physics/common/CMakeLists.txt
    branches/ge_harmony/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_ICanvas.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/ge_harmony/source/gameengine/SceneGraph/SG_IObject.h
    branches/ge_harmony/source/gameengine/VideoTexture/BlendType.h
    branches/ge_harmony/source/gameengine/VideoTexture/Common.h
    branches/ge_harmony/source/gameengine/VideoTexture/Exception.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/Exception.h
    branches/ge_harmony/source/gameengine/VideoTexture/FilterBase.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/FilterBase.h
    branches/ge_harmony/source/gameengine/VideoTexture/FilterBlueScreen.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/FilterBlueScreen.h
    branches/ge_harmony/source/gameengine/VideoTexture/FilterColor.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/FilterColor.h
    branches/ge_harmony/source/gameengine/VideoTexture/FilterNormal.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/FilterNormal.h
    branches/ge_harmony/source/gameengine/VideoTexture/FilterSource.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/FilterSource.h
    branches/ge_harmony/source/gameengine/VideoTexture/ImageBase.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/ImageBase.h
    branches/ge_harmony/source/gameengine/VideoTexture/ImageBuff.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/ImageBuff.h
    branches/ge_harmony/source/gameengine/VideoTexture/ImageMix.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/ImageMix.h
    branches/ge_harmony/source/gameengine/VideoTexture/ImageRender.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/ImageRender.h
    branches/ge_harmony/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/ImageViewport.h
    branches/ge_harmony/source/gameengine/VideoTexture/PyTypeList.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/PyTypeList.h
    branches/ge_harmony/source/gameengine/VideoTexture/Texture.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/Texture.h
    branches/ge_harmony/source/gameengine/VideoTexture/VideoBase.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/VideoBase.h
    branches/ge_harmony/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/ge_harmony/source/gameengine/VideoTexture/VideoFFmpeg.h
    branches/ge_harmony/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/ge_harmony/source/tests/CMakeLists.txt
    branches/ge_harmony/source/tests/bl_test.py
    branches/ge_harmony/source/tools/check_style_c.py
    branches/ge_harmony/source/tools/spell_check_source.py
    branches/ge_harmony/source/tools/spell_check_source_config.py

Added Paths:
-----------
    branches/ge_harmony/build_files/build_environment/
    branches/ge_harmony/build_files/buildbot/slave_rsync.py
    branches/ge_harmony/build_files/cmake/Modules/FindIcuLinux.cmake
    branches/ge_harmony/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h
    branches/ge_harmony/intern/audaspace/intern/AUD_Sequencer.cpp
    branches/ge_harmony/intern/audaspace/intern/AUD_Sequencer.h
    branches/ge_harmony/intern/cycles/blender/addon/osl.py
    branches/ge_harmony/intern/cycles/kernel/closure/bsdf_phong_ramp.h
    branches/ge_harmony/intern/cycles/kernel/osl/SConscript
    branches/ge_harmony/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
    branches/ge_harmony/intern/cycles/kernel/shaders/
    branches/ge_harmony/intern/cycles/util/util_stats.h
    branches/ge_harmony/intern/locale/
    branches/ge_harmony/release/darwin/
    branches/ge_harmony/source/blender/blenlib/BLI_math_interp.h
    branches/ge_harmony/source/blender/blenlib/intern/math_interp.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_bevel.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_similar.c
    branches/ge_harmony/source/blender/bmesh/tools/bmesh_bevel.c
    branches/ge_harmony/source/blender/bmesh/tools/bmesh_bevel.h
    branches/ge_harmony/source/blender/bmesh/tools/bmesh_decimate.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/bmesh/tools/bmesh_decimate_unsubdivide.c
    branches/ge_harmony/source/blender/compositor/nodes/COM_MapRangeNode.cpp
    branches/ge_harmony/source/blender/compositor/nodes/COM_MapRangeNode.h
    branches/ge_harmony/source/blender/compositor/operations/COM_MapRangeOperation.cpp
    branches/ge_harmony/source/blender/compositor/operations/COM_MapRangeOperation.h
    branches/ge_harmony/source/blender/modifiers/intern/MOD_triangulate.c
    branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_mapRange.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_normal_map.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_script.c
    branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tangent.c
    branches/ge_harmony/source/creator/blender.map
    branches/ge_harmony/source/gameengine/Ketsji/KX_CharacterWrapper.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_CharacterWrapper.h
    branches/ge_harmony/source/gameengine/Physics/common/PHY_ICharacter.h
    branches/ge_harmony/source/tests/bl_rst_completeness.py
    branches/ge_harmony/source/tests/rst_to_doctree_mini.py
    branches/ge_harmony/source/tools/check_style_c_config.py

Removed Paths:
-------------
    branches/ge_harmony/intern/audaspace/intern/AUD_Reference.h
    branches/ge_harmony/intern/audaspace/intern/AUD_ReferenceHandler.cpp
    branches/ge_harmony/intern/cycles/kernel/osl/nodes/
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_decimate.h
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_decimate_collapse.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_decimate_dissolve.c
    branches/ge_harmony/source/blender/bmesh/intern/bmesh_decimate_unsubdivide.c
    branches/ge_harmony/source/blender/bmesh/operators/bmo_bevel.c
    branches/ge_harmony/source/blender/imbuf/intern/cineon/logImageLib.c
    branches/ge_harmony/source/darwin/
    branches/ge_harmony/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
    branches/ge_harmony/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h

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-51750
   + /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

Modified: branches/ge_harmony/CMakeLists.txt
===================================================================
--- branches/ge_harmony/CMakeLists.txt	2012-11-23 03:15:16 UTC (rev 52499)
+++ branches/ge_harmony/CMakeLists.txt	2012-11-23 04:55:38 UTC (rev 52500)
@@ -234,6 +234,7 @@
 option(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON)
 if(UNIX AND NOT APPLE)
 	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
+	option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF)
 endif()
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
 option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder"  ON)
@@ -289,18 +290,14 @@
 		set(OSX_SYSTEM unsupported)
 	endif()
 	message(STATUS "Detected system-version: " ${OSX_SYSTEM})
-	
-	if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-			set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our minimum target, if you have higher sdk, weak linking happens
-	endif()
 
 	if(${CMAKE_GENERATOR} MATCHES "Xcode")
 	
-		##### workaround for actual official cmake incompatibility with xcode 4.3 #####
+		##### cmake incompatibility with xcode  4.3 and higher #####
 		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")
+			message(FATAL_ERROR "Xcode 4.3 and higher must be used with cmake 2.8-8 or higher")
 		endif()
-		### end workaround for actual official cmake incompatibility with xcode 4.3 ###
+		### end cmake incompatibility with xcode 4.3 and higher ###
 		
 		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.
@@ -315,7 +312,28 @@
 	endif()
 	
 	message(STATUS "Detected Xcode-version: " ${XCODE_VERSION})
+
+	if(${XCODE_VERSION} VERSION_LESS 4.3)
+		set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE)  # use guaranteed existing sdk
+	else()
+		# note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
+		# absolute pathes are more foolproof here !
+		set(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
+		set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
+		set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
+	endif()
 	
+	if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+			set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our min. target, if you use higher sdk, weak linking happens
+	endif()
+	
+	if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
+		# force CMAKE_OSX_DEPLOYMENT_TARGET for makefiles, will not work else ( cmake bug ? )
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+		add_definitions ("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+	endif()
+
 	option(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
 	option(USE_QTKIT	  "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
 	option(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
@@ -336,12 +354,20 @@
 	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()
 
-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")
+if(NOT WITH_AUDASPACE)
+	if(WITH_OPENAL)
+		message(FATAL_ERROR "WITH_OPENAL requires WITH_AUDASPACE")
+	endif()
+	if(WITH_JACK)
+		message(FATAL_ERROR "WITH_JACK requires WITH_AUDASPACE")
+	endif()
+	if(WITH_GAMEENGINE)
+		message(FATAL_ERROR "WITH_GAMEENGINE requires WITH_AUDASPACE")
+	endif()
 endif()
 
 if(NOT WITH_SDL AND WITH_GHOST_SDL)
-	message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
+	message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL")
 endif()
 
 if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG)))
@@ -372,8 +398,8 @@
 	set(WITH_OPENIMAGEIO ON)
 endif()
 
-# auto enable boost for cycles and booleans
-if(WITH_CYCLES OR WITH_MOD_BOOLEAN)
+# auto enable boost for cycles, booleans, audaspace or i18n
+if(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
 	set(WITH_BOOST ON)
 endif()
 
@@ -477,24 +503,23 @@
 #Platform specifics
 
 if(UNIX AND NOT APPLE)
-
-	# set lib directory if it exists
-	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-		if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/linux64)
-		else()
-			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/linux)
+	macro(find_package_wrapper)
+		STRING(TOUPPER ${ARGV0} _NAME_UPPER)
+		if(${WITH_STATIC_LIBS})
+			set(_cmake_find_library_suffixes_back ${CMAKE_FIND_LIBRARY_SUFFIXES})
+			set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
 		endif()
-
-		if(NOT EXISTS ${LIBDIR})
-			unset(LIBDIR)
+		find_package(${ARGV})
+		if(${WITH_STATIC_LIBS})
+			set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back})
+			unset(_cmake_find_library_suffixes_back)
 		endif()
-	endif()
+	endmacro()
 
-	find_package(JPEG REQUIRED)
-	find_package(PNG REQUIRED)
-	find_package(ZLIB REQUIRED)
-	find_package(Freetype REQUIRED)
+	find_package_wrapper(JPEG REQUIRED)
+	find_package_wrapper(PNG REQUIRED)
+	find_package_wrapper(ZLIB REQUIRED)
+	find_package_wrapper(Freetype REQUIRED)
 
 	if(WITH_PYTHON)
 		# No way to set py32. remove for now.
@@ -502,25 +527,28 @@
 
 		# Use our own instead, since wothout py is such a rare case,
 		# require this package
+		# XXX Linking errors with debian static python :/
+#		find_package_wrapper(PythonLibsUnix REQUIRED)
 		find_package(PythonLibsUnix REQUIRED)
 	endif()
 
-
 	if(WITH_IMAGE_OPENEXR)
-		find_package(OpenEXR)  # our own module
+		find_package_wrapper(OpenEXR)  # our own module
 		if(NOT OPENEXR_FOUND)
 			set(WITH_IMAGE_OPENEXR OFF)
 		endif()
 	endif()
 
 	if(WITH_IMAGE_OPENJPEG)
-		find_package(OpenJPEG)
+		find_package_wrapper(OpenJPEG)
 		if(NOT OPENJPEG_FOUND)
 			set(WITH_IMAGE_OPENJPEG OFF)
 		endif()
 	endif()
 
 	if(WITH_IMAGE_TIFF)
+		# XXX Linking errors with debian static tiff :/
+#		find_package_wrapper(TIFF)
 		find_package(TIFF)
 		if(NOT TIFF_FOUND)
 			set(WITH_IMAGE_TIFF OFF)
@@ -529,14 +557,14 @@
 
 	# Audio IO
 	if(WITH_OPENAL)
-		find_package(OpenAL)
+		find_package_wrapper(OpenAL)
 		if(NOT OPENAL_FOUND)
 			set(WITH_OPENAL OFF)
 		endif()
 	endif()
 
 	if(WITH_SDL)
-		find_package(SDL)
+		find_package_wrapper(SDL)
 		mark_as_advanced(
 			SDLMAIN_LIBRARY
 			SDL_INCLUDE_DIR
@@ -550,7 +578,7 @@
 	endif()
 
 	if(WITH_JACK)
-		find_package(Jack)
+		find_package_wrapper(Jack)
 		if(NOT JACK_FOUND)
 			set(WITH_JACK OFF)
 		endif()
@@ -558,22 +586,15 @@
 
 	# Codecs
 	if(WITH_CODEC_SNDFILE)
-		find_package(SndFile)
+		find_package_wrapper(SndFile)
 		if(NOT SNDFILE_FOUND)
 			set(WITH_CODEC_SNDFILE OFF)
 		endif()
 	endif()
 
 	if(WITH_CODEC_FFMPEG)
-		# use lib dir if available and nothing else specified
-		if(LIBDIR AND NOT FFMPEG)
-			set(FFMPEG ${LIBDIR}/ffmpeg CACHE PATH "FFMPEG Directory")
-			# XXX, some distros might need 'theoraenc theoradec' too
-			set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora vorbis vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG Libraries")
-		else()
-			set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
-			set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
-		endif()
+		set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
+		set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
 
 		mark_as_advanced(FFMPEG)
 
@@ -589,54 +610,32 @@
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
 	endif()
 
-	if(WITH_INTERNATIONAL)
-		find_library(INTL_LIBRARY
-			NAMES intl
-			PATHS
-			/sw/lib
-		)
-
-		find_library(ICONV_LIBRARY
-			NAMES iconv
-			PATHS
-			/sw/lib
-		)
-		mark_as_advanced(
-			ICONV_LIBRARY
-			INTL_LIBRARY
-		)
-
-		if(INTL_LIBRARY AND ICONV_LIBRARY)
-			set(GETTEXT_LIBRARIES ${INTL_LIBRARY} ${ICONV_LIBRARY})
-		endif()
-	endif()
-
 	if(WITH_FFTW3)
-		find_package(Fftw3)
+		find_package_wrapper(Fftw3)
 		if(NOT FFTW3_FOUND)
 			set(WITH_FFTW3 OFF)
 		endif()
 	endif()
 
 	if(WITH_OPENCOLLADA)
-		find_package(OpenCOLLADA)
+		find_package_wrapper(OpenCOLLADA)
 		if(OPENCOLLADA_FOUND)
-			find_package(XML2)
-			find_package(PCRE)
+			find_package_wrapper(XML2)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list