[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53542] branches/ge_components: Merged revision(s) 52166-53539 from trunk/blender

[Mitchell Stokes]

Revision: 53542
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53542
Author:   moguri
Date:     2013-01-04 02:01:50 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
Merged revision(s) 52166-53539 from trunk/blender

Modified Paths:
--------------
    branches/ge_components/CMakeLists.txt
    branches/ge_components/GNUmakefile
    branches/ge_components/SConstruct
    branches/ge_components/build_files/build_environment/install_deps.sh
    branches/ge_components/build_files/buildbot/config/user-config-glibc211-i686.py
    branches/ge_components/build_files/buildbot/config/user-config-glibc211-x86_64.py
    branches/ge_components/build_files/buildbot/config/user-config-glibc27-i686.py
    branches/ge_components/build_files/buildbot/config/user-config-glibc27-x86_64.py
    branches/ge_components/build_files/buildbot/config/user-config-player-glibc211-i686.py
    branches/ge_components/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
    branches/ge_components/build_files/buildbot/config/user-config-player-glibc27-i686.py
    branches/ge_components/build_files/buildbot/config/user-config-player-glibc27-x86_64.py
    branches/ge_components/build_files/buildbot/master.cfg
    branches/ge_components/build_files/cmake/Modules/FindOpenCOLLADA.cmake
    branches/ge_components/build_files/cmake/cmake_consistency_check.py
    branches/ge_components/build_files/cmake/cmake_netbeans_project.py
    branches/ge_components/build_files/cmake/cmake_qtcreator_project.py
    branches/ge_components/build_files/cmake/cmake_static_check_clang_array.py
    branches/ge_components/build_files/cmake/cmake_static_check_cppcheck.py
    branches/ge_components/build_files/cmake/cmake_static_check_smatch.py
    branches/ge_components/build_files/cmake/cmake_static_check_sparse.py
    branches/ge_components/build_files/cmake/cmake_static_check_splint.py
    branches/ge_components/build_files/cmake/example_scripts/make_quicky.py
    branches/ge_components/build_files/cmake/macros.cmake
    branches/ge_components/build_files/cmake/project_info.py
    branches/ge_components/build_files/cmake/project_source_info.py
    branches/ge_components/build_files/package_spec/rpm/blender.spec.in
    branches/ge_components/build_files/scons/config/darwin-config.py
    branches/ge_components/build_files/scons/config/freebsd7-config.py
    branches/ge_components/build_files/scons/config/freebsd8-config.py
    branches/ge_components/build_files/scons/config/freebsd9-config.py
    branches/ge_components/build_files/scons/config/linux-config.py
    branches/ge_components/build_files/scons/config/linuxcross-config.py
    branches/ge_components/build_files/scons/config/win32-mingw-config.py
    branches/ge_components/build_files/scons/config/win32-vc-config.py
    branches/ge_components/build_files/scons/config/win64-mingw-config.py
    branches/ge_components/build_files/scons/config/win64-vc-config.py
    branches/ge_components/build_files/scons/tools/Blender.py
    branches/ge_components/build_files/scons/tools/btools.py
    branches/ge_components/doc/blender_file_format/BlendFileDnaExporter_25.py
    branches/ge_components/doc/blender_file_format/BlendFileReader.py
    branches/ge_components/doc/manpage/blender.1
    branches/ge_components/doc/python_api/rst/bge.logic.rst
    branches/ge_components/doc/python_api/rst/bge.types.rst
    branches/ge_components/doc/python_api/rst/bgl.rst
    branches/ge_components/doc/python_api/rst/change_log.rst
    branches/ge_components/doc/python_api/rst/gpu.rst
    branches/ge_components/doc/python_api/rst/include__bmesh.rst
    branches/ge_components/doc/python_api/rst/info_gotcha.rst
    branches/ge_components/doc/python_api/rst/info_overview.rst
    branches/ge_components/doc/python_api/rst/info_quickstart.rst
    branches/ge_components/doc/python_api/rst/info_tips_and_tricks.rst
    branches/ge_components/doc/python_api/sphinx_doc_gen.py
    branches/ge_components/extern/CMakeLists.txt
    branches/ge_components/extern/SConscript
    branches/ge_components/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
    branches/ge_components/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
    branches/ge_components/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
    branches/ge_components/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
    branches/ge_components/extern/carve/patches/mingw_w64.patch
    branches/ge_components/extern/libmv/CMakeLists.txt
    branches/ge_components/extern/libmv/ChangeLog
    branches/ge_components/extern/libmv/bundle.sh
    branches/ge_components/extern/libmv/files.txt
    branches/ge_components/extern/libmv/libmv/multiview/fundamental.cc
    branches/ge_components/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
    branches/ge_components/extern/libmv/libmv/simple_pipeline/resect.cc
    branches/ge_components/extern/libmv/libmv/simple_pipeline/tracks.cc
    branches/ge_components/extern/libmv/libmv/simple_pipeline/tracks.h
    branches/ge_components/extern/libmv/libmv-capi.cpp
    branches/ge_components/extern/libmv/third_party/gflags/README.libmv
    branches/ge_components/extern/libmv/third_party/glog/README.libmv
    branches/ge_components/extern/libopenjpeg/patches/osx.patch
    branches/ge_components/extern/xdnd/xdnd.c
    branches/ge_components/intern/SConscript
    branches/ge_components/intern/audaspace/CMakeLists.txt
    branches/ge_components/intern/audaspace/FX/AUD_ButterworthFactory.cpp
    branches/ge_components/intern/audaspace/FX/AUD_ButterworthFactory.h
    branches/ge_components/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
    branches/ge_components/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
    branches/ge_components/intern/audaspace/FX/AUD_HighpassFactory.cpp
    branches/ge_components/intern/audaspace/FX/AUD_HighpassFactory.h
    branches/ge_components/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h
    branches/ge_components/intern/audaspace/FX/AUD_LowpassFactory.cpp
    branches/ge_components/intern/audaspace/FX/AUD_LowpassFactory.h
    branches/ge_components/intern/audaspace/SConscript
    branches/ge_components/intern/audaspace/intern/AUD_LinearResampleReader.cpp
    branches/ge_components/intern/bsp/SConscript
    branches/ge_components/intern/container/SConscript
    branches/ge_components/intern/cycles/CMakeLists.txt
    branches/ge_components/intern/cycles/SConscript
    branches/ge_components/intern/cycles/app/cycles_server.cpp
    branches/ge_components/intern/cycles/blender/CMakeLists.txt
    branches/ge_components/intern/cycles/blender/addon/__init__.py
    branches/ge_components/intern/cycles/blender/addon/engine.py
    branches/ge_components/intern/cycles/blender/addon/osl.py
    branches/ge_components/intern/cycles/blender/addon/properties.py
    branches/ge_components/intern/cycles/blender/addon/ui.py
    branches/ge_components/intern/cycles/blender/blender_camera.cpp
    branches/ge_components/intern/cycles/blender/blender_mesh.cpp
    branches/ge_components/intern/cycles/blender/blender_object.cpp
    branches/ge_components/intern/cycles/blender/blender_session.cpp
    branches/ge_components/intern/cycles/blender/blender_shader.cpp
    branches/ge_components/intern/cycles/blender/blender_sync.cpp
    branches/ge_components/intern/cycles/blender/blender_sync.h
    branches/ge_components/intern/cycles/blender/blender_util.h
    branches/ge_components/intern/cycles/bvh/bvh.cpp
    branches/ge_components/intern/cycles/bvh/bvh.h
    branches/ge_components/intern/cycles/bvh/bvh_build.cpp
    branches/ge_components/intern/cycles/bvh/bvh_build.h
    branches/ge_components/intern/cycles/bvh/bvh_params.h
    branches/ge_components/intern/cycles/bvh/bvh_sort.cpp
    branches/ge_components/intern/cycles/bvh/bvh_split.cpp
    branches/ge_components/intern/cycles/device/device.cpp
    branches/ge_components/intern/cycles/device/device.h
    branches/ge_components/intern/cycles/device/device_cpu.cpp
    branches/ge_components/intern/cycles/device/device_cuda.cpp
    branches/ge_components/intern/cycles/device/device_network.cpp
    branches/ge_components/intern/cycles/device/device_network.h
    branches/ge_components/intern/cycles/kernel/CMakeLists.txt
    branches/ge_components/intern/cycles/kernel/SConscript
    branches/ge_components/intern/cycles/kernel/closure/bsdf.h
    branches/ge_components/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
    branches/ge_components/intern/cycles/kernel/closure/bsdf_diffuse.h
    branches/ge_components/intern/cycles/kernel/closure/bsdf_microfacet.h
    branches/ge_components/intern/cycles/kernel/closure/bsdf_oren_nayar.h
    branches/ge_components/intern/cycles/kernel/closure/bsdf_phong_ramp.h
    branches/ge_components/intern/cycles/kernel/closure/bsdf_ward.h
    branches/ge_components/intern/cycles/kernel/closure/bsdf_westin.h
    branches/ge_components/intern/cycles/kernel/closure/emissive.h
    branches/ge_components/intern/cycles/kernel/closure/volume.h
    branches/ge_components/intern/cycles/kernel/kernel.cpp
    branches/ge_components/intern/cycles/kernel/kernel_accumulate.h
    branches/ge_components/intern/cycles/kernel/kernel_bvh.h
    branches/ge_components/intern/cycles/kernel/kernel_camera.h
    branches/ge_components/intern/cycles/kernel/kernel_compat_cpu.h
    branches/ge_components/intern/cycles/kernel/kernel_compat_cuda.h
    branches/ge_components/intern/cycles/kernel/kernel_compat_opencl.h
    branches/ge_components/intern/cycles/kernel/kernel_displace.h
    branches/ge_components/intern/cycles/kernel/kernel_emission.h
    branches/ge_components/intern/cycles/kernel/kernel_globals.h
    branches/ge_components/intern/cycles/kernel/kernel_light.h
    branches/ge_components/intern/cycles/kernel/kernel_montecarlo.h
    branches/ge_components/intern/cycles/kernel/kernel_object.h
    branches/ge_components/intern/cycles/kernel/kernel_passes.h
    branches/ge_components/intern/cycles/kernel/kernel_path.h
    branches/ge_components/intern/cycles/kernel/kernel_shader.h
    branches/ge_components/intern/cycles/kernel/kernel_textures.h
    branches/ge_components/intern/cycles/kernel/kernel_triangle.h
    branches/ge_components/intern/cycles/kernel/kernel_types.h
    branches/ge_components/intern/cycles/kernel/osl/CMakeLists.txt
    branches/ge_components/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
    branches/ge_components/intern/cycles/kernel/osl/emissive.cpp
    branches/ge_components/intern/cycles/kernel/osl/osl_closures.cpp
    branches/ge_components/intern/cycles/kernel/osl/osl_closures.h
    branches/ge_components/intern/cycles/kernel/osl/osl_globals.h
    branches/ge_components/intern/cycles/kernel/osl/osl_services.cpp
    branches/ge_components/intern/cycles/kernel/osl/osl_services.h
    branches/ge_components/intern/cycles/kernel/osl/osl_shader.cpp
    branches/ge_components/intern/cycles/kernel/osl/osl_shader.h
    branches/ge_components/intern/cycles/kernel/shaders/CMakeLists.txt
    branches/ge_components/intern/cycles/kernel/shaders/node_add_closure.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_attribute.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_background.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_brick_texture.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_brightness.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_checker_texture.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_combine_rgb.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_convert_from_color.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_convert_from_float.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_convert_from_int.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_convert_from_normal.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_convert_from_point.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_convert_from_vector.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_emission.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_environment_texture.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_gamma.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_geometry.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_glass_bsdf.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_glossy_bsdf.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_gradient_texture.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_hsv.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_image_texture.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_invert.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_light_falloff.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_magic_texture.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_mapping.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_mix.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_mix_closure.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_musgrave_texture.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_noise_texture.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_normal_map.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_output_surface.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_output_volume.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_refraction_bsdf.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_rgb_ramp.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_separate_rgb.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_sky_texture.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_texture_coordinate.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_translucent_bsdf.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_transparent_bsdf.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_value.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_velvet_bsdf.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_voronoi_texture.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_ward_bsdf.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_wave_texture.osl
    branches/ge_components/intern/cycles/kernel/shaders/stdosl.h
    branches/ge_components/intern/cycles/kernel/svm/svm.h
    branches/ge_components/intern/cycles/kernel/svm/svm_attribute.h
    branches/ge_components/intern/cycles/kernel/svm/svm_brick.h
    branches/ge_components/intern/cycles/kernel/svm/svm_closure.h
    branches/ge_components/intern/cycles/kernel/svm/svm_geometry.h
    branches/ge_components/intern/cycles/kernel/svm/svm_hsv.h
    branches/ge_components/intern/cycles/kernel/svm/svm_math.h
    branches/ge_components/intern/cycles/kernel/svm/svm_ramp.h
    branches/ge_components/intern/cycles/kernel/svm/svm_tex_coord.h
    branches/ge_components/intern/cycles/kernel/svm/svm_texture.h
    branches/ge_components/intern/cycles/kernel/svm/svm_types.h
    branches/ge_components/intern/cycles/kernel/svm/svm_voronoi.h
    branches/ge_components/intern/cycles/render/CMakeLists.txt
    branches/ge_components/intern/cycles/render/attribute.cpp
    branches/ge_components/intern/cycles/render/attribute.h
    branches/ge_components/intern/cycles/render/camera.cpp
    branches/ge_components/intern/cycles/render/camera.h
    branches/ge_components/intern/cycles/render/graph.cpp
    branches/ge_components/intern/cycles/render/graph.h
    branches/ge_components/intern/cycles/render/image.cpp
    branches/ge_components/intern/cycles/render/image.h
    branches/ge_components/intern/cycles/render/light.cpp
    branches/ge_components/intern/cycles/render/mesh.cpp
    branches/ge_components/intern/cycles/render/mesh.h
    branches/ge_components/intern/cycles/render/mesh_displace.cpp
    branches/ge_components/intern/cycles/render/nodes.cpp
    branches/ge_components/intern/cycles/render/nodes.h
    branches/ge_components/intern/cycles/render/object.cpp
    branches/ge_components/intern/cycles/render/object.h
    branches/ge_components/intern/cycles/render/osl.cpp
    branches/ge_components/intern/cycles/render/osl.h
    branches/ge_components/intern/cycles/render/scene.cpp
    branches/ge_components/intern/cycles/render/scene.h
    branches/ge_components/intern/cycles/render/session.cpp
    branches/ge_components/intern/cycles/render/shader.cpp
    branches/ge_components/intern/cycles/render/shader.h
    branches/ge_components/intern/cycles/render/svm.cpp
    branches/ge_components/intern/cycles/render/svm.h
    branches/ge_components/intern/cycles/subd/subd_dice.cpp
    branches/ge_components/intern/cycles/util/CMakeLists.txt
    branches/ge_components/intern/cycles/util/util_boundbox.h
    branches/ge_components/intern/cycles/util/util_cuda.cpp
    branches/ge_components/intern/cycles/util/util_cuda.h
    branches/ge_components/intern/cycles/util/util_math.h
    branches/ge_components/intern/cycles/util/util_thread.h
    branches/ge_components/intern/cycles/util/util_transform.cpp
    branches/ge_components/intern/cycles/util/util_transform.h
    branches/ge_components/intern/cycles/util/util_types.h
    branches/ge_components/intern/dualcon/SConscript
    branches/ge_components/intern/elbeem/SConscript
    branches/ge_components/intern/elbeem/intern/ntl_geometryobject.cpp
    branches/ge_components/intern/elbeem/intern/ntl_world.cpp
    branches/ge_components/intern/elbeem/intern/ntl_world.h
    branches/ge_components/intern/ghost/GHOST_C-api.h
    branches/ge_components/intern/ghost/GHOST_ISystem.h
    branches/ge_components/intern/ghost/SConscript
    branches/ge_components/intern/ghost/intern/GHOST_C-api.cpp
    branches/ge_components/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
    branches/ge_components/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
    branches/ge_components/intern/ghost/intern/GHOST_System.cpp
    branches/ge_components/intern/ghost/intern/GHOST_System.h
    branches/ge_components/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/ge_components/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/ge_components/intern/ghost/intern/GHOST_SystemSDL.cpp
    branches/ge_components/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/ge_components/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/ge_components/intern/ghost/intern/GHOST_WindowSDL.cpp
    branches/ge_components/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/ge_components/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/ge_components/intern/guardedalloc/SConscript
    branches/ge_components/intern/guardedalloc/intern/mallocn.c
    branches/ge_components/intern/iksolver/SConscript
    branches/ge_components/intern/iksolver/extern/IK_solver.h
    branches/ge_components/intern/iksolver/intern/IK_QJacobianSolver.cpp
    branches/ge_components/intern/itasc/SConscript
    branches/ge_components/intern/itasc/kdl/chain.hpp
    branches/ge_components/intern/itasc/kdl/tree.hpp
    branches/ge_components/intern/locale/CMakeLists.txt
    branches/ge_components/intern/locale/SConscript
    branches/ge_components/intern/locale/boost_locale_wrapper.cpp
    branches/ge_components/intern/memutil/MEM_CacheLimiter.h
    branches/ge_components/intern/memutil/SConscript
    branches/ge_components/intern/mikktspace/SConscript
    branches/ge_components/intern/moto/SConscript
    branches/ge_components/intern/opencolorio/SConscript
    branches/ge_components/intern/opencolorio/ocio_impl.cc
    branches/ge_components/intern/opennl/CMakeLists.txt
    branches/ge_components/intern/opennl/SConscript
    branches/ge_components/intern/raskter/SConscript
    branches/ge_components/intern/smoke/CMakeLists.txt
    branches/ge_components/intern/smoke/SConscript
    branches/ge_components/intern/smoke/intern/FFT_NOISE.h
    branches/ge_components/intern/smoke/intern/WTURBULENCE.cpp
    branches/ge_components/intern/string/SConscript
    branches/ge_components/intern/tools/bpy_introspect_ui.py
    branches/ge_components/intern/tools/credits_svn_gen.py
    branches/ge_components/intern/tools/dump_rna2xml.py
    branches/ge_components/intern/tools/pydna.py
    branches/ge_components/intern/utfconv/SConscript
    branches/ge_components/intern/utfconv/utfconv.h
    branches/ge_components/release/datafiles/fonts/droidsans.ttf.gz
    branches/ge_components/release/datafiles/splash.png
    branches/ge_components/release/datafiles/startup.blend
    branches/ge_components/release/scripts/modules/addon_utils.py
    branches/ge_components/release/scripts/modules/bl_i18n_utils/settings.py
    branches/ge_components/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
    branches/ge_components/release/scripts/modules/bl_i18n_utils/update_languages_menu.py
    branches/ge_components/release/scripts/modules/bl_i18n_utils/update_pot.py
    branches/ge_components/release/scripts/modules/bl_i18n_utils/update_trunk.py
    branches/ge_components/release/scripts/modules/bpy/ops.py
    branches/ge_components/release/scripts/modules/bpy/utils.py
    branches/ge_components/release/scripts/modules/bpy_extras/anim_utils.py
    branches/ge_components/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/ge_components/release/scripts/modules/bpy_extras/object_utils.py
    branches/ge_components/release/scripts/modules/bpy_types.py
    branches/ge_components/release/scripts/modules/rna_xml.py
    branches/ge_components/release/scripts/presets/interface_theme/back_to_black.xml
    branches/ge_components/release/scripts/presets/interface_theme/blender_24x.xml
    branches/ge_components/release/scripts/presets/interface_theme/elsyiun.xml
    branches/ge_components/release/scripts/presets/interface_theme/hexagon.xml
    branches/ge_components/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
    branches/ge_components/release/scripts/presets/keyconfig/maya.py
    branches/ge_components/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/ge_components/release/scripts/startup/bl_operators/anim.py
    branches/ge_components/release/scripts/startup/bl_operators/image.py
    branches/ge_components/release/scripts/startup/bl_operators/node.py
    branches/ge_components/release/scripts/startup/bl_operators/object.py
    branches/ge_components/release/scripts/startup/bl_operators/presets.py
    branches/ge_components/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
    branches/ge_components/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/ge_components/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/ge_components/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/ge_components/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/ge_components/release/scripts/startup/bl_operators/wm.py
    branches/ge_components/release/scripts/startup/bl_ui/__init__.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_game.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_mask_common.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_material.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_particle.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_physics_cloth.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_render.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_scene.py
    branches/ge_components/release/scripts/startup/bl_ui/properties_texture.py
    branches/ge_components/release/scripts/startup/bl_ui/space_clip.py
    branches/ge_components/release/scripts/startup/bl_ui/space_console.py
    branches/ge_components/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/ge_components/release/scripts/startup/bl_ui/space_graph.py
    branches/ge_components/release/scripts/startup/bl_ui/space_image.py
    branches/ge_components/release/scripts/startup/bl_ui/space_info.py
    branches/ge_components/release/scripts/startup/bl_ui/space_sequencer.py
    branches/ge_components/release/scripts/startup/bl_ui/space_text.py
    branches/ge_components/release/scripts/startup/bl_ui/space_userpref.py
    branches/ge_components/release/scripts/startup/bl_ui/space_view3d.py
    branches/ge_components/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/ge_components/release/scripts/startup/keyingsets_builtins.py
    branches/ge_components/release/text/readme.html
    branches/ge_components/source/SConscript
    branches/ge_components/source/blender/SConscript
    branches/ge_components/source/blender/avi/SConscript
    branches/ge_components/source/blender/avi/intern/avi_endian.c
    branches/ge_components/source/blender/avi/intern/avi_intern.h
    branches/ge_components/source/blender/avi/intern/avi_mjpeg.c
    branches/ge_components/source/blender/avi/intern/avi_rgb.c
    branches/ge_components/source/blender/blenfont/BLF_api.h
    branches/ge_components/source/blender/blenfont/BLF_translation.h
    branches/ge_components/source/blender/blenfont/SConscript
    branches/ge_components/source/blender/blenfont/intern/blf.c
    branches/ge_components/source/blender/blenfont/intern/blf_glyph.c
    branches/ge_components/source/blender/blenfont/intern/blf_lang.c
    branches/ge_components/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/ge_components/source/blender/blenkernel/BKE_armature.h
    branches/ge_components/source/blender/blenkernel/BKE_blender.h
    branches/ge_components/source/blender/blenkernel/BKE_brush.h
    branches/ge_components/source/blender/blenkernel/BKE_constraint.h
    branches/ge_components/source/blender/blenkernel/BKE_context.h
    branches/ge_components/source/blender/blenkernel/BKE_deform.h
    branches/ge_components/source/blender/blenkernel/BKE_displist.h
    branches/ge_components/source/blender/blenkernel/BKE_fluidsim.h
    branches/ge_components/source/blender/blenkernel/BKE_global.h
    branches/ge_components/source/blender/blenkernel/BKE_icons.h
    branches/ge_components/source/blender/blenkernel/BKE_idprop.h
    branches/ge_components/source/blender/blenkernel/BKE_image.h
    branches/ge_components/source/blender/blenkernel/BKE_key.h
    branches/ge_components/source/blender/blenkernel/BKE_lattice.h
    branches/ge_components/source/blender/blenkernel/BKE_library.h
    branches/ge_components/source/blender/blenkernel/BKE_main.h
    branches/ge_components/source/blender/blenkernel/BKE_mesh.h
    branches/ge_components/source/blender/blenkernel/BKE_modifier.h
    branches/ge_components/source/blender/blenkernel/BKE_node.h
    branches/ge_components/source/blender/blenkernel/BKE_object.h
    branches/ge_components/source/blender/blenkernel/BKE_packedFile.h
    branches/ge_components/source/blender/blenkernel/BKE_paint.h
    branches/ge_components/source/blender/blenkernel/BKE_particle.h
    branches/ge_components/source/blender/blenkernel/BKE_property.h
    branches/ge_components/source/blender/blenkernel/BKE_scene.h
    branches/ge_components/source/blender/blenkernel/BKE_screen.h
    branches/ge_components/source/blender/blenkernel/BKE_sequencer.h
    branches/ge_components/source/blender/blenkernel/BKE_shrinkwrap.h
    branches/ge_components/source/blender/blenkernel/BKE_suggestions.h
    branches/ge_components/source/blender/blenkernel/BKE_tessmesh.h
    branches/ge_components/source/blender/blenkernel/BKE_text.h
    branches/ge_components/source/blender/blenkernel/CMakeLists.txt
    branches/ge_components/source/blender/blenkernel/SConscript
    branches/ge_components/source/blender/blenkernel/intern/DerivedMesh.c
    branches/ge_components/source/blender/blenkernel/intern/action.c
    branches/ge_components/source/blender/blenkernel/intern/anim.c
    branches/ge_components/source/blender/blenkernel/intern/armature.c
    branches/ge_components/source/blender/blenkernel/intern/blender.c
    branches/ge_components/source/blender/blenkernel/intern/bmfont.c
    branches/ge_components/source/blender/blenkernel/intern/booleanops_mesh.c
    branches/ge_components/source/blender/blenkernel/intern/brush.c
    branches/ge_components/source/blender/blenkernel/intern/camera.c
    branches/ge_components/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/ge_components/source/blender/blenkernel/intern/cloth.c
    branches/ge_components/source/blender/blenkernel/intern/collision.c
    branches/ge_components/source/blender/blenkernel/intern/colortools.c
    branches/ge_components/source/blender/blenkernel/intern/constraint.c
    branches/ge_components/source/blender/blenkernel/intern/context.c
    branches/ge_components/source/blender/blenkernel/intern/curve.c
    branches/ge_components/source/blender/blenkernel/intern/customdata.c
    branches/ge_components/source/blender/blenkernel/intern/deform.c
    branches/ge_components/source/blender/blenkernel/intern/depsgraph.c
    branches/ge_components/source/blender/blenkernel/intern/displist.c
    branches/ge_components/source/blender/blenkernel/intern/dynamicpaint.c
    branches/ge_components/source/blender/blenkernel/intern/editderivedmesh.c
    branches/ge_components/source/blender/blenkernel/intern/fcurve.c
    branches/ge_components/source/blender/blenkernel/intern/gpencil.c
    branches/ge_components/source/blender/blenkernel/intern/idcode.c
    branches/ge_components/source/blender/blenkernel/intern/idprop.c
    branches/ge_components/source/blender/blenkernel/intern/image.c
    branches/ge_components/source/blender/blenkernel/intern/key.c
    branches/ge_components/source/blender/blenkernel/intern/lattice.c
    branches/ge_components/source/blender/blenkernel/intern/library.c
    branches/ge_components/source/blender/blenkernel/intern/mask.c
    branches/ge_components/source/blender/blenkernel/intern/mask_evaluate.c
    branches/ge_components/source/blender/blenkernel/intern/mask_rasterize.c
    branches/ge_components/source/blender/blenkernel/intern/material.c
    branches/ge_components/source/blender/blenkernel/intern/mball.c
    branches/ge_components/source/blender/blenkernel/intern/mesh.c
    branches/ge_components/source/blender/blenkernel/intern/modifier.c
    branches/ge_components/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/ge_components/source/blender/blenkernel/intern/movieclip.c
    branches/ge_components/source/blender/blenkernel/intern/multires.c
    branches/ge_components/source/blender/blenkernel/intern/node.c
    branches/ge_components/source/blender/blenkernel/intern/object.c
    branches/ge_components/source/blender/blenkernel/intern/ocean.c
    branches/ge_components/source/blender/blenkernel/intern/packedFile.c
    branches/ge_components/source/blender/blenkernel/intern/paint.c
    branches/ge_components/source/blender/blenkernel/intern/particle.c
    branches/ge_components/source/blender/blenkernel/intern/particle_system.c
    branches/ge_components/source/blender/blenkernel/intern/pointcache.c
    branches/ge_components/source/blender/blenkernel/intern/property.c
    branches/ge_components/source/blender/blenkernel/intern/report.c
    branches/ge_components/source/blender/blenkernel/intern/scene.c
    branches/ge_components/source/blender/blenkernel/intern/screen.c
    branches/ge_components/source/blender/blenkernel/intern/seqeffects.c
    branches/ge_components/source/blender/blenkernel/intern/seqmodifier.c
    branches/ge_components/source/blender/blenkernel/intern/sequencer.c
    branches/ge_components/source/blender/blenkernel/intern/smoke.c
    branches/ge_components/source/blender/blenkernel/intern/softbody.c
    branches/ge_components/source/blender/blenkernel/intern/speaker.c
    branches/ge_components/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/ge_components/source/blender/blenkernel/intern/suggestions.c
    branches/ge_components/source/blender/blenkernel/intern/text.c
    branches/ge_components/source/blender/blenkernel/intern/texture.c
    branches/ge_components/source/blender/blenkernel/intern/tracking.c
    branches/ge_components/source/blender/blenkernel/intern/world.c
    branches/ge_components/source/blender/blenkernel/intern/writeffmpeg.c
    branches/ge_components/source/blender/blenlib/BLI_array.h
    branches/ge_components/source/blender/blenlib/BLI_endian_switch.h
    branches/ge_components/source/blender/blenlib/BLI_endian_switch_inline.h
    branches/ge_components/source/blender/blenlib/BLI_ghash.h
    branches/ge_components/source/blender/blenlib/BLI_listbase.h
    branches/ge_components/source/blender/blenlib/BLI_math_base.h
    branches/ge_components/source/blender/blenlib/BLI_math_color.h
    branches/ge_components/source/blender/blenlib/BLI_math_geom.h
    branches/ge_components/source/blender/blenlib/BLI_math_inline.h
    branches/ge_components/source/blender/blenlib/BLI_math_matrix.h
    branches/ge_components/source/blender/blenlib/BLI_math_vector.h
    branches/ge_components/source/blender/blenlib/BLI_path_util.h
    branches/ge_components/source/blender/blenlib/BLI_rect.h
    branches/ge_components/source/blender/blenlib/BLI_scanfill.h
    branches/ge_components/source/blender/blenlib/BLI_threads.h
    branches/ge_components/source/blender/blenlib/BLI_utildefines.h
    branches/ge_components/source/blender/blenlib/CMakeLists.txt
    branches/ge_components/source/blender/blenlib/SConscript
    branches/ge_components/source/blender/blenlib/intern/BLI_ghash.c
    branches/ge_components/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/ge_components/source/blender/blenlib/intern/endian_switch.c
    branches/ge_components/source/blender/blenlib/intern/fileops.c
    branches/ge_components/source/blender/blenlib/intern/freetypefont.c
    branches/ge_components/source/blender/blenlib/intern/jitter.c
    branches/ge_components/source/blender/blenlib/intern/listbase.c
    branches/ge_components/source/blender/blenlib/intern/math_base_inline.c
    branches/ge_components/source/blender/blenlib/intern/math_color.c
    branches/ge_components/source/blender/blenlib/intern/math_color_inline.c
    branches/ge_components/source/blender/blenlib/intern/math_geom.c
    branches/ge_components/source/blender/blenlib/intern/math_geom_inline.c
    branches/ge_components/source/blender/blenlib/intern/math_interp.c
    branches/ge_components/source/blender/blenlib/intern/math_matrix.c
    branches/ge_components/source/blender/blenlib/intern/math_rotation.c
    branches/ge_components/source/blender/blenlib/intern/math_vector.c
    branches/ge_components/source/blender/blenlib/intern/math_vector_inline.c
    branches/ge_components/source/blender/blenlib/intern/noise.c
    branches/ge_components/source/blender/blenlib/intern/path_util.c
    branches/ge_components/source/blender/blenlib/intern/rct.c
    branches/ge_components/source/blender/blenlib/intern/scanfill.c
    branches/ge_components/source/blender/blenlib/intern/string.c
    branches/ge_components/source/blender/blenlib/intern/string_cursor_utf8.c
    branches/ge_components/source/blender/blenlib/intern/string_utf8.c
    branches/ge_components/source/blender/blenlib/intern/threads.c
    branches/ge_components/source/blender/blenlib/intern/winstuff.c
    branches/ge_components/source/blender/blenloader/BLO_readfile.h
    branches/ge_components/source/blender/blenloader/CMakeLists.txt
    branches/ge_components/source/blender/blenloader/SConscript
    branches/ge_components/source/blender/blenloader/intern/readblenentry.c
    branches/ge_components/source/blender/blenloader/intern/readfile.c
    branches/ge_components/source/blender/blenloader/intern/readfile.h
    branches/ge_components/source/blender/blenloader/intern/versioning_250.c
    branches/ge_components/source/blender/blenloader/intern/versioning_legacy.c
    branches/ge_components/source/blender/blenloader/intern/writefile.c
    branches/ge_components/source/blender/bmesh/CMakeLists.txt
    branches/ge_components/source/blender/bmesh/SConscript
    branches/ge_components/source/blender/bmesh/bmesh.h
    branches/ge_components/source/blender/bmesh/bmesh_class.h
    branches/ge_components/source/blender/bmesh/intern/bmesh_construct.c
    branches/ge_components/source/blender/bmesh/intern/bmesh_construct.h
    branches/ge_components/source/blender/bmesh/intern/bmesh_core.c
    branches/ge_components/source/blender/bmesh/intern/bmesh_core.h
    branches/ge_components/source/blender/bmesh/intern/bmesh_interp.c
    branches/ge_components/source/blender/bmesh/intern/bmesh_iterators.h
    branches/ge_components/source/blender/bmesh/intern/bmesh_marking.c
    branches/ge_components/source/blender/bmesh/intern/bmesh_mesh.c
    branches/ge_components/source/blender/bmesh/intern/bmesh_mesh.h
    branches/ge_components/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/ge_components/source/blender/bmesh/intern/bmesh_mods.c
    branches/ge_components/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/ge_components/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/ge_components/source/blender/bmesh/intern/bmesh_operator_api_inline.h
    branches/ge_components/source/blender/bmesh/intern/bmesh_operators.c
    branches/ge_components/source/blender/bmesh/intern/bmesh_operators.h
    branches/ge_components/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/ge_components/source/blender/bmesh/intern/bmesh_polygon.c
    branches/ge_components/source/blender/bmesh/intern/bmesh_private.h
    branches/ge_components/source/blender/bmesh/intern/bmesh_queries.c
    branches/ge_components/source/blender/bmesh/intern/bmesh_queries.h
    branches/ge_components/source/blender/bmesh/operators/bmo_connect.c
    branches/ge_components/source/blender/bmesh/operators/bmo_create.c
    branches/ge_components/source/blender/bmesh/operators/bmo_dissolve.c
    branches/ge_components/source/blender/bmesh/operators/bmo_dupe.c
    branches/ge_components/source/blender/bmesh/operators/bmo_edgesplit.c
    branches/ge_components/source/blender/bmesh/operators/bmo_extrude.c
    branches/ge_components/source/blender/bmesh/operators/bmo_hull.c
    branches/ge_components/source/blender/bmesh/operators/bmo_inset.c
    branches/ge_components/source/blender/bmesh/operators/bmo_join_triangles.c
    branches/ge_components/source/blender/bmesh/operators/bmo_mesh_conv.c
    branches/ge_components/source/blender/bmesh/operators/bmo_mirror.c
    branches/ge_components/source/blender/bmesh/operators/bmo_primitive.c
    branches/ge_components/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/ge_components/source/blender/bmesh/operators/bmo_similar.c
    branches/ge_components/source/blender/bmesh/operators/bmo_slide.c
    branches/ge_components/source/blender/bmesh/operators/bmo_smooth_laplacian.c
    branches/ge_components/source/blender/bmesh/operators/bmo_subdivide.c
    branches/ge_components/source/blender/bmesh/operators/bmo_subdivide.h
    branches/ge_components/source/blender/bmesh/operators/bmo_symmetrize.c
    branches/ge_components/source/blender/bmesh/operators/bmo_triangulate.c
    branches/ge_components/source/blender/bmesh/operators/bmo_unsubdivide.c
    branches/ge_components/source/blender/bmesh/operators/bmo_utils.c
    branches/ge_components/source/blender/bmesh/operators/bmo_wireframe.c
    branches/ge_components/source/blender/bmesh/tools/BME_bevel.c
    branches/ge_components/source/blender/collada/AnimationImporter.cpp
    branches/ge_components/source/blender/collada/ArmatureImporter.cpp
    branches/ge_components/source/blender/collada/ArmatureImporter.h
    branches/ge_components/source/blender/collada/DocumentImporter.cpp
    branches/ge_components/source/blender/collada/DocumentImporter.h
    branches/ge_components/source/blender/collada/ImageExporter.cpp
    branches/ge_components/source/blender/collada/MaterialExporter.cpp
    branches/ge_components/source/blender/collada/MeshImporter.cpp
    branches/ge_components/source/blender/collada/SConscript
    branches/ge_components/source/blender/collada/SkinInfo.cpp
    branches/ge_components/source/blender/collada/SkinInfo.h
    branches/ge_components/source/blender/collada/TransformReader.cpp
    branches/ge_components/source/blender/collada/TransformReader.h
    branches/ge_components/source/blender/collada/TransformWriter.cpp
    branches/ge_components/source/blender/collada/TransformWriter.h
    branches/ge_components/source/blender/collada/collada_internal.cpp
    branches/ge_components/source/blender/collada/collada_internal.h
    branches/ge_components/source/blender/collada/collada_utils.cpp
    branches/ge_components/source/blender/compositor/CMakeLists.txt
    branches/ge_components/source/blender/compositor/SConscript
    branches/ge_components/source/blender/compositor/intern/COM_Converter.cpp
    branches/ge_components/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/ge_components/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/ge_components/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/ge_components/source/blender/compositor/intern/COM_ExecutionSystem.h
    branches/ge_components/source/blender/compositor/intern/COM_Node.cpp
    branches/ge_components/source/blender/compositor/intern/COM_Node.h
    branches/ge_components/source/blender/compositor/intern/COM_NodeOperation.cpp
    branches/ge_components/source/blender/compositor/intern/COM_NodeOperation.h
    branches/ge_components/source/blender/compositor/intern/COM_OpenCLDevice.cpp
    branches/ge_components/source/blender/compositor/intern/COM_WorkPackage.h
    branches/ge_components/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/ge_components/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
    branches/ge_components/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/ge_components/source/blender/compositor/nodes/COM_MuteNode.cpp
    branches/ge_components/source/blender/compositor/nodes/COM_NormalNode.cpp
    branches/ge_components/source/blender/compositor/nodes/COM_OutputFileNode.cpp
    branches/ge_components/source/blender/compositor/nodes/COM_ScaleNode.cpp
    branches/ge_components/source/blender/compositor/operations/COM_CropOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_ImageOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_MovieClipOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_NormalizeOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_OpenCLKernels.cl
    branches/ge_components/source/blender/compositor/operations/COM_OutputFileOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/ge_components/source/blender/datatoc/datatoc.c
    branches/ge_components/source/blender/editors/SConscript
    branches/ge_components/source/blender/editors/animation/SConscript
    branches/ge_components/source/blender/editors/animation/anim_channels_defines.c
    branches/ge_components/source/blender/editors/animation/anim_channels_edit.c
    branches/ge_components/source/blender/editors/animation/anim_draw.c
    branches/ge_components/source/blender/editors/animation/anim_filter.c
    branches/ge_components/source/blender/editors/animation/anim_markers.c
    branches/ge_components/source/blender/editors/animation/fmodifier_ui.c
    branches/ge_components/source/blender/editors/animation/keyframes_draw.c
    branches/ge_components/source/blender/editors/animation/keyframing.c
    branches/ge_components/source/blender/editors/armature/BIF_generate.h
    branches/ge_components/source/blender/editors/armature/SConscript
    branches/ge_components/source/blender/editors/armature/editarmature.c
    branches/ge_components/source/blender/editors/armature/editarmature_generate.c
    branches/ge_components/source/blender/editors/armature/editarmature_retarget.c
    branches/ge_components/source/blender/editors/armature/editarmature_sketch.c
    branches/ge_components/source/blender/editors/armature/meshlaplacian.c
    branches/ge_components/source/blender/editors/armature/poselib.c
    branches/ge_components/source/blender/editors/armature/poseobject.c
    branches/ge_components/source/blender/editors/armature/reeb.c
    branches/ge_components/source/blender/editors/curve/SConscript
    branches/ge_components/source/blender/editors/curve/editcurve.c
    branches/ge_components/source/blender/editors/curve/editfont.c
    branches/ge_components/source/blender/editors/datafiles/CMakeLists.txt
    branches/ge_components/source/blender/editors/datafiles/SConscript
    branches/ge_components/source/blender/editors/gpencil/SConscript
    branches/ge_components/source/blender/editors/gpencil/drawgpencil.c
    branches/ge_components/source/blender/editors/gpencil/editaction_gpencil.c
    branches/ge_components/source/blender/editors/gpencil/gpencil_buttons.c
    branches/ge_components/source/blender/editors/gpencil/gpencil_edit.c
    branches/ge_components/source/blender/editors/gpencil/gpencil_paint.c
    branches/ge_components/source/blender/editors/include/BIF_gl.h
    branches/ge_components/source/blender/editors/include/ED_anim_api.h
    branches/ge_components/source/blender/editors/include/ED_armature.h
    branches/ge_components/source/blender/editors/include/ED_datafiles.h
    branches/ge_components/source/blender/editors/include/ED_gpencil.h
    branches/ge_components/source/blender/editors/include/ED_image.h
    branches/ge_components/source/blender/editors/include/ED_mask.h
    branches/ge_components/source/blender/editors/include/ED_mesh.h
    branches/ge_components/source/blender/editors/include/ED_object.h
    branches/ge_components/source/blender/editors/include/ED_screen.h
    branches/ge_components/source/blender/editors/include/ED_sequencer.h
    branches/ge_components/source/blender/editors/include/ED_transform.h
    branches/ge_components/source/blender/editors/include/ED_view3d.h
    branches/ge_components/source/blender/editors/include/UI_icons.h
    branches/ge_components/source/blender/editors/include/UI_interface.h
    branches/ge_components/source/blender/editors/include/UI_interface_icons.h
    branches/ge_components/source/blender/editors/include/UI_resources.h
    branches/ge_components/source/blender/editors/include/UI_view2d.h
    branches/ge_components/source/blender/editors/interface/SConscript
    branches/ge_components/source/blender/editors/interface/interface.c
    branches/ge_components/source/blender/editors/interface/interface_draw.c
    branches/ge_components/source/blender/editors/interface/interface_handlers.c
    branches/ge_components/source/blender/editors/interface/interface_icons.c
    branches/ge_components/source/blender/editors/interface/interface_intern.h
    branches/ge_components/source/blender/editors/interface/interface_layout.c
    branches/ge_components/source/blender/editors/interface/interface_ops.c
    branches/ge_components/source/blender/editors/interface/interface_panel.c
    branches/ge_components/source/blender/editors/interface/interface_regions.c
    branches/ge_components/source/blender/editors/interface/interface_style.c
    branches/ge_components/source/blender/editors/interface/interface_templates.c
    branches/ge_components/source/blender/editors/interface/interface_utils.c
    branches/ge_components/source/blender/editors/interface/interface_widgets.c
    branches/ge_components/source/blender/editors/interface/resources.c
    branches/ge_components/source/blender/editors/interface/view2d.c
    branches/ge_components/source/blender/editors/interface/view2d_ops.c
    branches/ge_components/source/blender/editors/io/SConscript
    branches/ge_components/source/blender/editors/mask/SConscript
    branches/ge_components/source/blender/editors/mask/mask_edit.c
    branches/ge_components/source/blender/editors/mask/mask_editaction.c
    branches/ge_components/source/blender/editors/mask/mask_relationships.c
    branches/ge_components/source/blender/editors/mesh/SConscript
    branches/ge_components/source/blender/editors/mesh/editface.c
    branches/ge_components/source/blender/editors/mesh/editmesh_add.c
    branches/ge_components/source/blender/editors/mesh/editmesh_bvh.c
    branches/ge_components/source/blender/editors/mesh/editmesh_knife.c
    branches/ge_components/source/blender/editors/mesh/editmesh_loopcut.c
    branches/ge_components/source/blender/editors/mesh/editmesh_rip.c
    branches/ge_components/source/blender/editors/mesh/editmesh_select.c
    branches/ge_components/source/blender/editors/mesh/editmesh_slide.c
    branches/ge_components/source/blender/editors/mesh/editmesh_tools.c
    branches/ge_components/source/blender/editors/mesh/editmesh_utils.c
    branches/ge_components/source/blender/editors/mesh/mesh_data.c
    branches/ge_components/source/blender/editors/mesh/mesh_intern.h
    branches/ge_components/source/blender/editors/mesh/mesh_navmesh.c
    branches/ge_components/source/blender/editors/mesh/mesh_ops.c
    branches/ge_components/source/blender/editors/mesh/meshtools.c
    branches/ge_components/source/blender/editors/metaball/SConscript
    branches/ge_components/source/blender/editors/object/SConscript
    branches/ge_components/source/blender/editors/object/object_add.c
    branches/ge_components/source/blender/editors/object/object_bake.c
    branches/ge_components/source/blender/editors/object/object_constraint.c
    branches/ge_components/source/blender/editors/object/object_edit.c
    branches/ge_components/source/blender/editors/object/object_group.c
    branches/ge_components/source/blender/editors/object/object_lattice.c
    branches/ge_components/source/blender/editors/object/object_modifier.c
    branches/ge_components/source/blender/editors/object/object_ops.c
    branches/ge_components/source/blender/editors/object/object_relations.c
    branches/ge_components/source/blender/editors/object/object_select.c
    branches/ge_components/source/blender/editors/object/object_shapekey.c
    branches/ge_components/source/blender/editors/object/object_transform.c
    branches/ge_components/source/blender/editors/object/object_vgroup.c
    branches/ge_components/source/blender/editors/physics/SConscript
    branches/ge_components/source/blender/editors/physics/particle_edit.c
    branches/ge_components/source/blender/editors/physics/particle_object.c
    branches/ge_components/source/blender/editors/physics/physics_fluid.c
    branches/ge_components/source/blender/editors/render/SConscript
    branches/ge_components/source/blender/editors/render/render_internal.c
    branches/ge_components/source/blender/editors/render/render_opengl.c
    branches/ge_components/source/blender/editors/render/render_preview.c
    branches/ge_components/source/blender/editors/render/render_shading.c
    branches/ge_components/source/blender/editors/render/render_update.c
    branches/ge_components/source/blender/editors/render/render_view.c
    branches/ge_components/source/blender/editors/screen/SConscript
    branches/ge_components/source/blender/editors/screen/area.c
    branches/ge_components/source/blender/editors/screen/glutil.c
    branches/ge_components/source/blender/editors/screen/screen_edit.c
    branches/ge_components/source/blender/editors/screen/screen_intern.h
    branches/ge_components/source/blender/editors/screen/screen_ops.c
    branches/ge_components/source/blender/editors/screen/screendump.c
    branches/ge_components/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/ge_components/source/blender/editors/sculpt_paint/SConscript
    branches/ge_components/source/blender/editors/sculpt_paint/paint_hide.c
    branches/ge_components/source/blender/editors/sculpt_paint/paint_image.c
    branches/ge_components/source/blender/editors/sculpt_paint/paint_intern.h
    branches/ge_components/source/blender/editors/sculpt_paint/paint_mask.c
    branches/ge_components/source/blender/editors/sculpt_paint/paint_ops.c
    branches/ge_components/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/ge_components/source/blender/editors/sculpt_paint/paint_utils.c
    branches/ge_components/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/ge_components/source/blender/editors/sculpt_paint/sculpt.c
    branches/ge_components/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/ge_components/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/ge_components/source/blender/editors/sound/SConscript
    branches/ge_components/source/blender/editors/space_action/SConscript
    branches/ge_components/source/blender/editors/space_action/action_draw.c
    branches/ge_components/source/blender/editors/space_action/action_edit.c
    branches/ge_components/source/blender/editors/space_action/space_action.c
    branches/ge_components/source/blender/editors/space_api/SConscript
    branches/ge_components/source/blender/editors/space_buttons/SConscript
    branches/ge_components/source/blender/editors/space_buttons/buttons_context.c
    branches/ge_components/source/blender/editors/space_buttons/buttons_texture.c
    branches/ge_components/source/blender/editors/space_buttons/space_buttons.c
    branches/ge_components/source/blender/editors/space_clip/SConscript
    branches/ge_components/source/blender/editors/space_clip/clip_buttons.c
    branches/ge_components/source/blender/editors/space_clip/clip_draw.c
    branches/ge_components/source/blender/editors/space_clip/clip_editor.c
    branches/ge_components/source/blender/editors/space_clip/clip_intern.h
    branches/ge_components/source/blender/editors/space_clip/space_clip.c
    branches/ge_components/source/blender/editors/space_clip/tracking_ops.c
    branches/ge_components/source/blender/editors/space_clip/tracking_select.c
    branches/ge_components/source/blender/editors/space_console/SConscript
    branches/ge_components/source/blender/editors/space_console/console_draw.c
    branches/ge_components/source/blender/editors/space_console/console_intern.h
    branches/ge_components/source/blender/editors/space_console/console_ops.c
    branches/ge_components/source/blender/editors/space_console/space_console.c
    branches/ge_components/source/blender/editors/space_file/SConscript
    branches/ge_components/source/blender/editors/space_file/file_draw.c
    branches/ge_components/source/blender/editors/space_file/fsmenu.c
    branches/ge_components/source/blender/editors/space_file/space_file.c
    branches/ge_components/source/blender/editors/space_graph/SConscript
    branches/ge_components/source/blender/editors/space_graph/graph_buttons.c
    branches/ge_components/source/blender/editors/space_graph/graph_draw.c
    branches/ge_components/source/blender/editors/space_graph/graph_edit.c
    branches/ge_components/source/blender/editors/space_graph/graph_ops.c
    branches/ge_components/source/blender/editors/space_graph/space_graph.c
    branches/ge_components/source/blender/editors/space_image/SConscript
    branches/ge_components/source/blender/editors/space_image/image_buttons.c
    branches/ge_components/source/blender/editors/space_image/image_draw.c
    branches/ge_components/source/blender/editors/space_image/image_edit.c
    branches/ge_components/source/blender/editors/space_image/image_ops.c
    branches/ge_components/source/blender/editors/space_image/space_image.c
    branches/ge_components/source/blender/editors/space_info/SConscript
    branches/ge_components/source/blender/editors/space_info/info_draw.c
    branches/ge_components/source/blender/editors/space_info/info_intern.h
    branches/ge_components/source/blender/editors/space_info/info_ops.c
    branches/ge_components/source/blender/editors/space_info/info_report.c
    branches/ge_components/source/blender/editors/space_info/info_stats.c
    branches/ge_components/source/blender/editors/space_info/space_info.c
    branches/ge_components/source/blender/editors/space_info/textview.c
    branches/ge_components/source/blender/editors/space_info/textview.h
    branches/ge_components/source/blender/editors/space_logic/SConscript
    branches/ge_components/source/blender/editors/space_logic/logic_window.c
    branches/ge_components/source/blender/editors/space_logic/space_logic.c
    branches/ge_components/source/blender/editors/space_nla/SConscript
    branches/ge_components/source/blender/editors/space_nla/nla_draw.c
    branches/ge_components/source/blender/editors/space_node/CMakeLists.txt
    branches/ge_components/source/blender/editors/space_node/SConscript
    branches/ge_components/source/blender/editors/space_node/drawnode.c
    branches/ge_components/source/blender/editors/space_node/node_add.c
    branches/ge_components/source/blender/editors/space_node/node_buttons.c
    branches/ge_components/source/blender/editors/space_node/node_draw.c
    branches/ge_components/source/blender/editors/space_node/node_edit.c
    branches/ge_components/source/blender/editors/space_node/node_group.c
    branches/ge_components/source/blender/editors/space_node/node_intern.h
    branches/ge_components/source/blender/editors/space_node/node_ops.c
    branches/ge_components/source/blender/editors/space_node/node_templates.c
    branches/ge_components/source/blender/editors/space_node/node_view.c
    branches/ge_components/source/blender/editors/space_node/space_node.c
    branches/ge_components/source/blender/editors/space_outliner/SConscript
    branches/ge_components/source/blender/editors/space_outliner/outliner_draw.c
    branches/ge_components/source/blender/editors/space_outliner/outliner_edit.c
    branches/ge_components/source/blender/editors/space_outliner/outliner_intern.h
    branches/ge_components/source/blender/editors/space_outliner/outliner_select.c
    branches/ge_components/source/blender/editors/space_outliner/outliner_tools.c
    branches/ge_components/source/blender/editors/space_outliner/outliner_tree.c
    branches/ge_components/source/blender/editors/space_outliner/space_outliner.c
    branches/ge_components/source/blender/editors/space_script/SConscript
    branches/ge_components/source/blender/editors/space_sequencer/SConscript
    branches/ge_components/source/blender/editors/space_sequencer/sequencer_add.c
    branches/ge_components/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/ge_components/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/ge_components/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/ge_components/source/blender/editors/space_sequencer/space_sequencer.c
    branches/ge_components/source/blender/editors/space_text/CMakeLists.txt
    branches/ge_components/source/blender/editors/space_text/SConscript
    branches/ge_components/source/blender/editors/space_text/space_text.c
    branches/ge_components/source/blender/editors/space_text/text_draw.c
    branches/ge_components/source/blender/editors/space_text/text_header.c
    branches/ge_components/source/blender/editors/space_text/text_intern.h
    branches/ge_components/source/blender/editors/space_text/text_ops.c
    branches/ge_components/source/blender/editors/space_time/SConscript
    branches/ge_components/source/blender/editors/space_userpref/SConscript
    branches/ge_components/source/blender/editors/space_userpref/space_userpref.c
    branches/ge_components/source/blender/editors/space_view3d/SConscript
    branches/ge_components/source/blender/editors/space_view3d/drawarmature.c
    branches/ge_components/source/blender/editors/space_view3d/drawmesh.c
    branches/ge_components/source/blender/editors/space_view3d/drawobject.c
    branches/ge_components/source/blender/editors/space_view3d/drawvolume.c
    branches/ge_components/source/blender/editors/space_view3d/space_view3d.c
    branches/ge_components/source/blender/editors/space_view3d/view3d_buttons.c
    branches/ge_components/source/blender/editors/space_view3d/view3d_draw.c
    branches/ge_components/source/blender/editors/space_view3d/view3d_edit.c
    branches/ge_components/source/blender/editors/space_view3d/view3d_fly.c
    branches/ge_components/source/blender/editors/space_view3d/view3d_header.c
    branches/ge_components/source/blender/editors/space_view3d/view3d_intern.h
    branches/ge_components/source/blender/editors/space_view3d/view3d_iterators.c
    branches/ge_components/source/blender/editors/space_view3d/view3d_ops.c
    branches/ge_components/source/blender/editors/space_view3d/view3d_project.c
    branches/ge_components/source/blender/editors/space_view3d/view3d_select.c
    branches/ge_components/source/blender/editors/space_view3d/view3d_snap.c
    branches/ge_components/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/ge_components/source/blender/editors/space_view3d/view3d_view.c
    branches/ge_components/source/blender/editors/transform/CMakeLists.txt
    branches/ge_components/source/blender/editors/transform/SConscript
    branches/ge_components/source/blender/editors/transform/transform.c
    branches/ge_components/source/blender/editors/transform/transform.h
    branches/ge_components/source/blender/editors/transform/transform_constraints.c
    branches/ge_components/source/blender/editors/transform/transform_conversions.c
    branches/ge_components/source/blender/editors/transform/transform_generics.c
    branches/ge_components/source/blender/editors/transform/transform_input.c
    branches/ge_components/source/blender/editors/transform/transform_manipulator.c
    branches/ge_components/source/blender/editors/transform/transform_orientations.c
    branches/ge_components/source/blender/editors/transform/transform_snap.c
    branches/ge_components/source/blender/editors/util/SConscript
    branches/ge_components/source/blender/editors/util/numinput.c
    branches/ge_components/source/blender/editors/util/undo.c
    branches/ge_components/source/blender/editors/uvedit/SConscript
    branches/ge_components/source/blender/editors/uvedit/uvedit_buttons.c
    branches/ge_components/source/blender/editors/uvedit/uvedit_draw.c
    branches/ge_components/source/blender/editors/uvedit/uvedit_intern.h
    branches/ge_components/source/blender/editors/uvedit/uvedit_ops.c
    branches/ge_components/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/ge_components/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/ge_components/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/ge_components/source/blender/gpu/CMakeLists.txt
    branches/ge_components/source/blender/gpu/GPU_buffers.h
    branches/ge_components/source/blender/gpu/GPU_draw.h
    branches/ge_components/source/blender/gpu/GPU_material.h
    branches/ge_components/source/blender/gpu/SConscript
    branches/ge_components/source/blender/gpu/intern/gpu_buffers.c
    branches/ge_components/source/blender/gpu/intern/gpu_draw.c
    branches/ge_components/source/blender/gpu/intern/gpu_extensions.c
    branches/ge_components/source/blender/gpu/intern/gpu_material.c
    branches/ge_components/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/ge_components/source/blender/gpu/shaders/gpu_shader_vertex.glsl
    branches/ge_components/source/blender/ikplugin/SConscript
    branches/ge_components/source/blender/ikplugin/intern/ikplugin_api.c
    branches/ge_components/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/ge_components/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/ge_components/source/blender/imbuf/IMB_colormanagement.h
    branches/ge_components/source/blender/imbuf/IMB_imbuf.h
    branches/ge_components/source/blender/imbuf/IMB_imbuf_types.h
    branches/ge_components/source/blender/imbuf/SConscript
    branches/ge_components/source/blender/imbuf/intern/IMB_filter.h
    branches/ge_components/source/blender/imbuf/intern/IMB_metadata.h
    branches/ge_components/source/blender/imbuf/intern/allocimbuf.c
    branches/ge_components/source/blender/imbuf/intern/anim_movie.c
    branches/ge_components/source/blender/imbuf/intern/cineon/SConscript
    branches/ge_components/source/blender/imbuf/intern/cineon/cineon_dpx.c
    branches/ge_components/source/blender/imbuf/intern/cineon/cineonlib.c
    branches/ge_components/source/blender/imbuf/intern/cineon/dpxlib.c
    branches/ge_components/source/blender/imbuf/intern/colormanagement.c
    branches/ge_components/source/blender/imbuf/intern/dds/BlockDXT.h
    branches/ge_components/source/blender/imbuf/intern/dds/FlipDXT.cpp
    branches/ge_components/source/blender/imbuf/intern/dds/SConscript
    branches/ge_components/source/blender/imbuf/intern/dds/dds_api.cpp
    branches/ge_components/source/blender/imbuf/intern/divers.c
    branches/ge_components/source/blender/imbuf/intern/filter.c
    branches/ge_components/source/blender/imbuf/intern/imageprocess.c
    branches/ge_components/source/blender/imbuf/intern/indexer.c
    branches/ge_components/source/blender/imbuf/intern/jp2.c
    branches/ge_components/source/blender/imbuf/intern/jpeg.c
    branches/ge_components/source/blender/imbuf/intern/openexr/SConscript
    branches/ge_components/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/ge_components/source/blender/imbuf/intern/openexr/openexr_multi.h
    branches/ge_components/source/blender/imbuf/intern/png.c
    branches/ge_components/source/blender/imbuf/intern/radiance_hdr.c
    branches/ge_components/source/blender/imbuf/intern/readimage.c
    branches/ge_components/source/blender/imbuf/intern/scaling.c
    branches/ge_components/source/blender/imbuf/intern/tiff.c
    branches/ge_components/source/blender/imbuf/intern/util.c
    branches/ge_components/source/blender/makesdna/DNA_ID.h
    branches/ge_components/source/blender/makesdna/DNA_action_types.h
    branches/ge_components/source/blender/makesdna/DNA_armature_types.h
    branches/ge_components/source/blender/makesdna/DNA_brush_types.h
    branches/ge_components/source/blender/makesdna/DNA_customdata_types.h
    branches/ge_components/source/blender/makesdna/DNA_image_types.h
    branches/ge_components/source/blender/makesdna/DNA_mesh_types.h
    branches/ge_components/source/blender/makesdna/DNA_modifier_types.h
    branches/ge_components/source/blender/makesdna/DNA_node_types.h
    branches/ge_components/source/blender/makesdna/DNA_particle_types.h
    branches/ge_components/source/blender/makesdna/DNA_scene_types.h
    branches/ge_components/source/blender/makesdna/DNA_screen_types.h
    branches/ge_components/source/blender/makesdna/DNA_sequence_types.h
    branches/ge_components/source/blender/makesdna/DNA_space_types.h
    branches/ge_components/source/blender/makesdna/DNA_text_types.h
    branches/ge_components/source/blender/makesdna/DNA_texture_types.h
    branches/ge_components/source/blender/makesdna/DNA_tracking_types.h
    branches/ge_components/source/blender/makesdna/DNA_userdef_types.h
    branches/ge_components/source/blender/makesdna/DNA_view2d_types.h
    branches/ge_components/source/blender/makesdna/DNA_view3d_types.h
    branches/ge_components/source/blender/makesdna/DNA_windowmanager_types.h
    branches/ge_components/source/blender/makesdna/SConscript
    branches/ge_components/source/blender/makesdna/intern/SConscript
    branches/ge_components/source/blender/makesdna/intern/makesdna.c
    branches/ge_components/source/blender/makesrna/RNA_access.h
    branches/ge_components/source/blender/makesrna/RNA_enum_types.h
    branches/ge_components/source/blender/makesrna/RNA_types.h
    branches/ge_components/source/blender/makesrna/SConscript
    branches/ge_components/source/blender/makesrna/intern/SConscript
    branches/ge_components/source/blender/makesrna/intern/makesrna.c
    branches/ge_components/source/blender/makesrna/intern/rna_access.c
    branches/ge_components/source/blender/makesrna/intern/rna_action.c
    branches/ge_components/source/blender/makesrna/intern/rna_actuator.c
    branches/ge_components/source/blender/makesrna/intern/rna_animation.c
    branches/ge_components/source/blender/makesrna/intern/rna_armature.c
    branches/ge_components/source/blender/makesrna/intern/rna_brush.c
    branches/ge_components/source/blender/makesrna/intern/rna_camera.c
    branches/ge_components/source/blender/makesrna/intern/rna_cloth.c
    branches/ge_components/source/blender/makesrna/intern/rna_color.c
    branches/ge_components/source/blender/makesrna/intern/rna_constraint.c
    branches/ge_components/source/blender/makesrna/intern/rna_define.c
    branches/ge_components/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/ge_components/source/blender/makesrna/intern/rna_image.c
    branches/ge_components/source/blender/makesrna/intern/rna_image_api.c
    branches/ge_components/source/blender/makesrna/intern/rna_lamp.c
    branches/ge_components/source/blender/makesrna/intern/rna_main_api.c
    branches/ge_components/source/blender/makesrna/intern/rna_material.c
    branches/ge_components/source/blender/makesrna/intern/rna_mesh.c
    branches/ge_components/source/blender/makesrna/intern/rna_modifier.c
    branches/ge_components/source/blender/makesrna/intern/rna_movieclip.c
    branches/ge_components/source/blender/makesrna/intern/rna_nodetree.c
    branches/ge_components/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/ge_components/source/blender/makesrna/intern/rna_object.c
    branches/ge_components/source/blender/makesrna/intern/rna_object_api.c
    branches/ge_components/source/blender/makesrna/intern/rna_object_force.c
    branches/ge_components/source/blender/makesrna/intern/rna_particle.c
    branches/ge_components/source/blender/makesrna/intern/rna_pose.c
    branches/ge_components/source/blender/makesrna/intern/rna_render.c
    branches/ge_components/source/blender/makesrna/intern/rna_rna.c
    branches/ge_components/source/blender/makesrna/intern/rna_scene.c
    branches/ge_components/source/blender/makesrna/intern/rna_scene_api.c
    branches/ge_components/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/ge_components/source/blender/makesrna/intern/rna_sequencer.c
    branches/ge_components/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/ge_components/source/blender/makesrna/intern/rna_space.c
    branches/ge_components/source/blender/makesrna/intern/rna_speaker.c
    branches/ge_components/source/blender/makesrna/intern/rna_text.c
    branches/ge_components/source/blender/makesrna/intern/rna_texture.c
    branches/ge_components/source/blender/makesrna/intern/rna_tracking.c
    branches/ge_components/source/blender/makesrna/intern/rna_ui.c
    branches/ge_components/source/blender/makesrna/intern/rna_ui_api.c
    branches/ge_components/source/blender/makesrna/intern/rna_userdef.c
    branches/ge_components/source/blender/makesrna/intern/rna_wm.c
    branches/ge_components/source/blender/makesrna/rna_cleanup/rna_cleaner.py
    branches/ge_components/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
    branches/ge_components/source/blender/modifiers/CMakeLists.txt
    branches/ge_components/source/blender/modifiers/MOD_modifiertypes.h
    branches/ge_components/source/blender/modifiers/SConscript
    branches/ge_components/source/blender/modifiers/intern/MOD_armature.c
    branches/ge_components/source/blender/modifiers/intern/MOD_array.c
    branches/ge_components/source/blender/modifiers/intern/MOD_bevel.c
    branches/ge_components/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/ge_components/source/blender/modifiers/intern/MOD_decimate.c
    branches/ge_components/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/ge_components/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/ge_components/source/blender/modifiers/intern/MOD_laplaciansmooth.c
    branches/ge_components/source/blender/modifiers/intern/MOD_ocean.c
    branches/ge_components/source/blender/modifiers/intern/MOD_screw.c
    branches/ge_components/source/blender/modifiers/intern/MOD_shapekey.c
    branches/ge_components/source/blender/modifiers/intern/MOD_skin.c
    branches/ge_components/source/blender/modifiers/intern/MOD_solidify.c
    branches/ge_components/source/blender/modifiers/intern/MOD_util.c
    branches/ge_components/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/ge_components/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/ge_components/source/blender/nodes/CMakeLists.txt
    branches/ge_components/source/blender/nodes/NOD_composite.h
    branches/ge_components/source/blender/nodes/NOD_shader.h
    branches/ge_components/source/blender/nodes/NOD_texture.h
    branches/ge_components/source/blender/nodes/SConscript
    branches/ge_components/source/blender/nodes/composite/node_composite_tree.c
    branches/ge_components/source/blender/nodes/composite/node_composite_util.c
    branches/ge_components/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/ge_components/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/ge_components/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/ge_components/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/ge_components/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/ge_components/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/ge_components/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/ge_components/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/ge_components/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/ge_components/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/ge_components/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/ge_components/source/blender/nodes/intern/node_common.c
    branches/ge_components/source/blender/nodes/intern/node_exec.c
    branches/ge_components/source/blender/nodes/intern/node_socket.c
    branches/ge_components/source/blender/nodes/shader/node_shader_util.c
    branches/ge_components/source/blender/nodes/shader/nodes/node_shader_common.c
    branches/ge_components/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/ge_components/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/ge_components/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/ge_components/source/blender/nodes/shader/nodes/node_shader_normal.c
    branches/ge_components/source/blender/nodes/shader/nodes/node_shader_normal_map.c
    branches/ge_components/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
    branches/ge_components/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    branches/ge_components/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/ge_components/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/ge_components/source/blender/opencl/SConscript
    branches/ge_components/source/blender/python/SConscript
    branches/ge_components/source/blender/python/bmesh/CMakeLists.txt
    branches/ge_components/source/blender/python/bmesh/bmesh_py_api.c
    branches/ge_components/source/blender/python/bmesh/bmesh_py_ops.c
    branches/ge_components/source/blender/python/bmesh/bmesh_py_types.c
    branches/ge_components/source/blender/python/bmesh/bmesh_py_types.h
    branches/ge_components/source/blender/python/bmesh/bmesh_py_types_customdata.c
    branches/ge_components/source/blender/python/bmesh/bmesh_py_types_meshdata.c
    branches/ge_components/source/blender/python/bmesh/bmesh_py_types_select.c
    branches/ge_components/source/blender/python/bmesh/bmesh_py_utils.c
    branches/ge_components/source/blender/python/generic/bgl.c
    branches/ge_components/source/blender/python/generic/bpy_internal_import.c
    branches/ge_components/source/blender/python/generic/idprop_py_api.c
    branches/ge_components/source/blender/python/generic/py_capi_utils.c
    branches/ge_components/source/blender/python/generic/py_capi_utils.h
    branches/ge_components/source/blender/python/intern/CMakeLists.txt
    branches/ge_components/source/blender/python/intern/bpy.c
    branches/ge_components/source/blender/python/intern/bpy_app.c
    branches/ge_components/source/blender/python/intern/bpy_interface.c
    branches/ge_components/source/blender/python/intern/bpy_intern_string.c
    branches/ge_components/source/blender/python/intern/bpy_intern_string.h
    branches/ge_components/source/blender/python/intern/bpy_props.c
    branches/ge_components/source/blender/python/intern/bpy_rna.c
    branches/ge_components/source/blender/python/intern/bpy_rna.h
    branches/ge_components/source/blender/python/intern/bpy_rna_anim.c
    branches/ge_components/source/blender/python/intern/bpy_rna_array.c
    branches/ge_components/source/blender/python/intern/bpy_rna_callback.c
    branches/ge_components/source/blender/python/intern/bpy_rna_callback.h
    branches/ge_components/source/blender/python/intern/bpy_traceback.c
    branches/ge_components/source/blender/python/intern/bpy_util.h
    branches/ge_components/source/blender/python/mathutils/mathutils.c
    branches/ge_components/source/blender/python/mathutils/mathutils.h
    branches/ge_components/source/blender/python/mathutils/mathutils_Color.c
    branches/ge_components/source/blender/python/mathutils/mathutils_Euler.c
    branches/ge_components/source/blender/python/mathutils/mathutils_Matrix.c
    branches/ge_components/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/ge_components/source/blender/python/mathutils/mathutils_Vector.c
    branches/ge_components/source/blender/python/mathutils/mathutils_geometry.c
    branches/ge_components/source/blender/quicktime/SConscript
    branches/ge_components/source/blender/quicktime/apple/qtkit_export.m
    branches/ge_components/source/blender/quicktime/quicktime_export.h
    branches/ge_components/source/blender/render/CMakeLists.txt
    branches/ge_components/source/blender/render/SConscript
    branches/ge_components/source/blender/render/extern/include/RE_engine.h
    branches/ge_components/source/blender/render/extern/include/RE_pipeline.h
    branches/ge_components/source/blender/render/intern/include/initrender.h
    branches/ge_components/source/blender/render/intern/include/pixelblending.h
    branches/ge_components/source/blender/render/intern/include/rayobject.h
    branches/ge_components/source/blender/render/intern/include/render_result.h
    branches/ge_components/source/blender/render/intern/include/render_types.h
    branches/ge_components/source/blender/render/intern/include/rendercore.h
    branches/ge_components/source/blender/render/intern/include/renderdatabase.h
    branches/ge_components/source/blender/render/intern/include/strand.h
    branches/ge_components/source/blender/render/intern/include/zbuf.h
    branches/ge_components/source/blender/render/intern/raytrace/rayobject.cpp
    branches/ge_components/source/blender/render/intern/raytrace/rayobject_instance.cpp
    branches/ge_components/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/ge_components/source/blender/render/intern/source/convertblender.c
    branches/ge_components/source/blender/render/intern/source/envmap.c
    branches/ge_components/source/blender/render/intern/source/external_engine.c
    branches/ge_components/source/blender/render/intern/source/imagetexture.c
    branches/ge_components/source/blender/render/intern/source/initrender.c
    branches/ge_components/source/blender/render/intern/source/occlusion.c
    branches/ge_components/source/blender/render/intern/source/pipeline.c
    branches/ge_components/source/blender/render/intern/source/pixelblending.c
    branches/ge_components/source/blender/render/intern/source/pointdensity.c
    branches/ge_components/source/blender/render/intern/source/rayshade.c
    branches/ge_components/source/blender/render/intern/source/render_result.c
    branches/ge_components/source/blender/render/intern/source/render_texture.c
    branches/ge_components/source/blender/render/intern/source/rendercore.c
    branches/ge_components/source/blender/render/intern/source/renderdatabase.c
    branches/ge_components/source/blender/render/intern/source/shadbuf.c
    branches/ge_components/source/blender/render/intern/source/shadeoutput.c
    branches/ge_components/source/blender/render/intern/source/strand.c
    branches/ge_components/source/blender/render/intern/source/volume_precache.c
    branches/ge_components/source/blender/render/intern/source/voxeldata.c
    branches/ge_components/source/blender/render/intern/source/zbuf.c
    branches/ge_components/source/blender/windowmanager/SConscript
    branches/ge_components/source/blender/windowmanager/WM_api.h
    branches/ge_components/source/blender/windowmanager/WM_types.h
    branches/ge_components/source/blender/windowmanager/intern/wm.c
    branches/ge_components/source/blender/windowmanager/intern/wm_apple.c
    branches/ge_components/source/blender/windowmanager/intern/wm_draw.c
    branches/ge_components/source/blender/windowmanager/intern/wm_event_system.c
    branches/ge_components/source/blender/windowmanager/intern/wm_files.c
    branches/ge_components/source/blender/windowmanager/intern/wm_gesture.c
    branches/ge_components/source/blender/windowmanager/intern/wm_init_exit.c
    branches/ge_components/source/blender/windowmanager/intern/wm_jobs.c
    branches/ge_components/source/blender/windowmanager/intern/wm_keymap.c
    branches/ge_components/source/blender/windowmanager/intern/wm_operators.c
    branches/ge_components/source/blender/windowmanager/intern/wm_playanim.c
    branches/ge_components/source/blender/windowmanager/intern/wm_subwindow.c
    branches/ge_components/source/blender/windowmanager/intern/wm_window.c
    branches/ge_components/source/blender/windowmanager/wm_event_system.h
    branches/ge_components/source/blender/windowmanager/wm_event_types.h
    branches/ge_components/source/blender/windowmanager/wm_files.h
    branches/ge_components/source/blender/windowmanager/wm_subwindow.h
    branches/ge_components/source/blender/windowmanager/wm_window.h
    branches/ge_components/source/blenderplayer/CMakeLists.txt
    branches/ge_components/source/blenderplayer/bad_level_call_stubs/SConscript
    branches/ge_components/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/ge_components/source/creator/CMakeLists.txt
    branches/ge_components/source/creator/creator.c
    branches/ge_components/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/ge_components/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/ge_components/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/ge_components/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/ge_components/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/ge_components/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
    branches/ge_components/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp
    branches/ge_components/source/gameengine/BlenderRoutines/SConscript
    branches/ge_components/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/ge_components/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/ge_components/source/gameengine/Converter/BL_BlenderDataConversion.h
    branches/ge_components/source/gameengine/Converter/CMakeLists.txt
    branches/ge_components/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/ge_components/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/ge_components/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/ge_components/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/ge_components/source/gameengine/Converter/SConscript
    branches/ge_components/source/gameengine/Expressions/IntValue.cpp
    branches/ge_components/source/gameengine/Expressions/ListValue.cpp
    branches/ge_components/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/ge_components/source/gameengine/Expressions/PyObjectPlus.h
    branches/ge_components/source/gameengine/Expressions/SConscript
    branches/ge_components/source/gameengine/GameLogic/CMakeLists.txt
    branches/ge_components/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/ge_components/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
    branches/ge_components/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/ge_components/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/ge_components/source/gameengine/GameLogic/SCA_IController.cpp
    branches/ge_components/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/ge_components/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/ge_components/source/gameengine/GameLogic/SCA_JoystickManager.cpp
    branches/ge_components/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/ge_components/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/ge_components/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/ge_components/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/ge_components/source/gameengine/GameLogic/SCA_PythonController.h
    branches/ge_components/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
    branches/ge_components/source/gameengine/GameLogic/SCA_PythonMouse.cpp
    branches/ge_components/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/ge_components/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/ge_components/source/gameengine/GameLogic/SConscript
    branches/ge_components/source/gameengine/GamePlayer/SConscript
    branches/ge_components/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
    branches/ge_components/source/gameengine/GamePlayer/common/GPC_Canvas.h
    branches/ge_components/source/gameengine/GamePlayer/common/SConscript
    branches/ge_components/source/gameengine/GamePlayer/common/bmfont.cpp
    branches/ge_components/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/ge_components/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/ge_components/source/gameengine/GamePlayer/ghost/SConscript
    branches/ge_components/source/gameengine/GamePlayer/xembed/UnixShell.c
    branches/ge_components/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/ge_components/source/gameengine/Ketsji/BL_Material.cpp
    branches/ge_components/source/gameengine/Ketsji/BL_Material.h
    branches/ge_components/source/gameengine/Ketsji/BL_Shader.cpp
    branches/ge_components/source/gameengine/Ketsji/BL_Texture.cpp
    branches/ge_components/source/gameengine/Ketsji/CMakeLists.txt
    branches/ge_components/source/gameengine/Ketsji/KXNetwork/SConscript
    branches/ge_components/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/ge_components/source/gameengine/Ketsji/KX_Camera.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_CharacterWrapper.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_CharacterWrapper.h
    branches/ge_components/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_Dome.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_Dome.h
    branches/ge_components/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/ge_components/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/ge_components/source/gameengine/Ketsji/KX_Light.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_Light.h
    branches/ge_components/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/ge_components/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_Scene.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_VertexProxy.h
    branches/ge_components/source/gameengine/Ketsji/SConscript
    branches/ge_components/source/gameengine/Network/LoopBackNetwork/SConscript
    branches/ge_components/source/gameengine/Network/SConscript
    branches/ge_components/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/ge_components/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/ge_components/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/ge_components/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/ge_components/source/gameengine/Physics/Bullet/SConscript
    branches/ge_components/source/gameengine/Physics/Dummy/SConscript
    branches/ge_components/source/gameengine/Physics/common/PHY_ICharacter.h
    branches/ge_components/source/gameengine/Physics/common/SConscript
    branches/ge_components/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/ge_components/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/ge_components/source/gameengine/Rasterizer/RAS_ICanvas.h
    branches/ge_components/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/ge_components/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/ge_components/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/ge_components/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/ge_components/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/ge_components/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/ge_components/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/ge_components/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/ge_components/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/ge_components/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/ge_components/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/ge_components/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/ge_components/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/ge_components/source/gameengine/Rasterizer/RAS_texmatrix.cpp
    branches/ge_components/source/gameengine/Rasterizer/SConscript
    branches/ge_components/source/gameengine/SConscript
    branches/ge_components/source/gameengine/SceneGraph/SConscript
    branches/ge_components/source/gameengine/SceneGraph/SG_IObject.h
    branches/ge_components/source/gameengine/VideoTexture/BlendType.h
    branches/ge_components/source/gameengine/VideoTexture/Common.h
    branches/ge_components/source/gameengine/VideoTexture/Exception.cpp
    branches/ge_components/source/gameengine/VideoTexture/Exception.h
    branches/ge_components/source/gameengine/VideoTexture/FilterBase.cpp
    branches/ge_components/source/gameengine/VideoTexture/FilterBase.h
    branches/ge_components/source/gameengine/VideoTexture/FilterBlueScreen.cpp
    branches/ge_components/source/gameengine/VideoTexture/FilterBlueScreen.h
    branches/ge_components/source/gameengine/VideoTexture/FilterColor.cpp
    branches/ge_components/source/gameengine/VideoTexture/FilterColor.h
    branches/ge_components/source/gameengine/VideoTexture/FilterNormal.cpp
    branches/ge_components/source/gameengine/VideoTexture/FilterNormal.h
    branches/ge_components/source/gameengine/VideoTexture/FilterSource.cpp
    branches/ge_components/source/gameengine/VideoTexture/FilterSource.h
    branches/ge_components/source/gameengine/VideoTexture/ImageBase.cpp
    branches/ge_components/source/gameengine/VideoTexture/ImageBase.h
    branches/ge_components/source/gameengine/VideoTexture/ImageBuff.cpp
    branches/ge_components/source/gameengine/VideoTexture/ImageBuff.h
    branches/ge_components/source/gameengine/VideoTexture/ImageMix.cpp
    branches/ge_components/source/gameengine/VideoTexture/ImageMix.h
    branches/ge_components/source/gameengine/VideoTexture/ImageRender.cpp
    branches/ge_components/source/gameengine/VideoTexture/ImageRender.h
    branches/ge_components/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/ge_components/source/gameengine/VideoTexture/ImageViewport.h
    branches/ge_components/source/gameengine/VideoTexture/PyTypeList.cpp
    branches/ge_components/source/gameengine/VideoTexture/PyTypeList.h
    branches/ge_components/source/gameengine/VideoTexture/SConscript
    branches/ge_components/source/gameengine/VideoTexture/Texture.cpp
    branches/ge_components/source/gameengine/VideoTexture/Texture.h
    branches/ge_components/source/gameengine/VideoTexture/VideoBase.cpp
    branches/ge_components/source/gameengine/VideoTexture/VideoBase.h
    branches/ge_components/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/ge_components/source/gameengine/VideoTexture/VideoFFmpeg.h
    branches/ge_components/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/ge_components/source/icons/SConscript
    branches/ge_components/source/tests/bl_load_addons.py
    branches/ge_components/source/tests/bl_run_operators.py
    branches/ge_components/source/tests/check_deprecated.py
    branches/ge_components/source/tools/check_style_c.py
    branches/ge_components/source/tools/spell_check_source.py
    branches/ge_components/source/tools/spell_check_source_config.py
    branches/ge_components/source/tools/tag_release.py

Added Paths:
-----------
    branches/ge_components/build_files/buildbot/slave_rsync.py
    branches/ge_components/build_files/cmake/Modules/FindIcuLinux.cmake
    branches/ge_components/doc/python_api/examples/bmesh.ops.1.py
    branches/ge_components/doc/python_api/examples/bpy.types.AddonPreferences.1.py
    branches/ge_components/doc/python_api/rst/info_api_reference.rst
    branches/ge_components/doc/python_api/rst/info_tutorial_addon.rst
    branches/ge_components/doc/python_api/rst_from_bmesh_opdefines.py
    branches/ge_components/doc/sculpt.org
    branches/ge_components/extern/bullet2/src/BulletCollision/Gimpact/btCompoundFromGimpact.h
    branches/ge_components/extern/rangetree/
    branches/ge_components/intern/audaspace/FX/AUD_BandpassCalculator.cpp
    branches/ge_components/intern/audaspace/FX/AUD_BandpassCalculator.h
    branches/ge_components/intern/audaspace/FX/AUD_ButterworthCalculator.cpp
    branches/ge_components/intern/audaspace/FX/AUD_ButterworthCalculator.h
    branches/ge_components/intern/audaspace/FX/AUD_HighpassCalculator.cpp
    branches/ge_components/intern/audaspace/FX/AUD_HighpassCalculator.h
    branches/ge_components/intern/audaspace/FX/AUD_LowpassCalculator.cpp
    branches/ge_components/intern/audaspace/FX/AUD_LowpassCalculator.h
    branches/ge_components/intern/cycles/blender/blender_curves.cpp
    branches/ge_components/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
    branches/ge_components/intern/cycles/kernel/closure/bsdf_toon.h
    branches/ge_components/intern/cycles/kernel/closure/bsdf_util.h
    branches/ge_components/intern/cycles/kernel/kernel_curve.h
    branches/ge_components/intern/cycles/kernel/kernel_primitive.h
    branches/ge_components/intern/cycles/kernel/osl/SConscript
    branches/ge_components/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
    branches/ge_components/intern/cycles/kernel/osl/bsdf_toon.cpp
    branches/ge_components/intern/cycles/kernel/shaders/SConscript
    branches/ge_components/intern/cycles/kernel/shaders/node_convert_from_string.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_hair_info.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_rgb_curves.osl
    branches/ge_components/intern/cycles/kernel/shaders/node_vector_curves.osl
    branches/ge_components/intern/cycles/render/curves.cpp
    branches/ge_components/intern/cycles/render/curves.h
    branches/ge_components/release/darwin/
    branches/ge_components/release/datafiles/blender_icons.sh
    branches/ge_components/release/datafiles/blender_icons.svg
    branches/ge_components/release/datafiles/blender_icons16.png
    branches/ge_components/release/datafiles/blender_icons32.png
    branches/ge_components/release/datafiles/prvicons.sh
    branches/ge_components/release/datafiles/prvicons.svg
    branches/ge_components/release/datafiles/splash_template.xcf
    branches/ge_components/release/scripts/modules/bpy_restrict_state.py
    branches/ge_components/release/scripts/templates_osl/
    branches/ge_components/release/scripts/templates_py/
    branches/ge_components/source/blender/blenkernel/BKE_addon.h
    branches/ge_components/source/blender/blenkernel/BKE_bpath.h
    branches/ge_components/source/blender/blenkernel/BKE_pbvh.h
    branches/ge_components/source/blender/blenkernel/intern/addon.c
    branches/ge_components/source/blender/blenkernel/intern/bpath.c
    branches/ge_components/source/blender/blenkernel/intern/pbvh.c
    branches/ge_components/source/blender/blenkernel/intern/pbvh_bmesh.c
    branches/ge_components/source/blender/blenkernel/intern/pbvh_intern.h
    branches/ge_components/source/blender/blenlib/BLI_buffer.h
    branches/ge_components/source/blender/blenlib/intern/buffer.c
    branches/ge_components/source/blender/bmesh/intern/bmesh_log.c
    branches/ge_components/source/blender/bmesh/intern/bmesh_log.h
    branches/ge_components/source/blender/bmesh/operators/bmo_bevel.c
    branches/ge_components/source/blender/bmesh/tools/bmesh_bevel.c
    branches/ge_components/source/blender/bmesh/tools/bmesh_bevel.h
    branches/ge_components/source/blender/bmesh/tools/bmesh_decimate.h
    branches/ge_components/source/blender/bmesh/tools/bmesh_decimate_collapse.c
    branches/ge_components/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
    branches/ge_components/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
    branches/ge_components/source/blender/bmesh/tools/bmesh_edgesplit.c
    branches/ge_components/source/blender/bmesh/tools/bmesh_edgesplit.h
    branches/ge_components/source/blender/compositor/nodes/COM_MapRangeNode.cpp
    branches/ge_components/source/blender/compositor/nodes/COM_MapRangeNode.h
    branches/ge_components/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.h
    branches/ge_components/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.h
    branches/ge_components/source/blender/compositor/operations/COM_MapRangeOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_MapRangeOperation.h
    branches/ge_components/source/blender/editors/sculpt_paint/paint_image_2d.c
    branches/ge_components/source/blender/editors/space_node/node_toolbar.c
    branches/ge_components/source/blender/editors/space_text/text_autocomplete.c
    branches/ge_components/source/blender/editors/space_text/text_format.c
    branches/ge_components/source/blender/editors/space_text/text_format.h
    branches/ge_components/source/blender/editors/space_text/text_format_osl.c
    branches/ge_components/source/blender/editors/space_text/text_format_py.c
    branches/ge_components/source/blender/modifiers/intern/MOD_triangulate.c
    branches/ge_components/source/blender/modifiers/intern/MOD_uvwarp.c
    branches/ge_components/source/blender/nodes/composite/nodes/node_composite_mapRange.c
    branches/ge_components/source/blender/nodes/shader/nodes/node_shader_hair_info.c
    branches/ge_components/source/blender/python/bmesh/bmesh_py_ops_call.c
    branches/ge_components/source/blender/python/bmesh/bmesh_py_ops_call.h
    branches/ge_components/source/blender/python/intern/bpy_app_build_options.c
    branches/ge_components/source/blender/python/intern/bpy_app_build_options.h
    branches/ge_components/source/blender/render/extern/include/RE_multires_bake.h
    branches/ge_components/source/blender/render/intern/source/multires_bake.c
    branches/ge_components/source/creator/blender.map
    branches/ge_components/source/creator/osx_locals.map
    branches/ge_components/source/gameengine/Converter/KX_LibLoadStatus.cpp
    branches/ge_components/source/gameengine/Converter/KX_LibLoadStatus.h
    branches/ge_components/source/gameengine/GameLogic/SCA_PythonJoystick.cpp
    branches/ge_components/source/gameengine/GameLogic/SCA_PythonJoystick.h
    branches/ge_components/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h
    branches/ge_components/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
    branches/ge_components/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.h
    branches/ge_components/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
    branches/ge_components/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.h
    branches/ge_components/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
    branches/ge_components/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.h
    branches/ge_components/source/tests/bl_rst_completeness.py
    branches/ge_components/source/tests/rst_to_doctree_mini.py

Removed Paths:
-------------
    branches/ge_components/extern/eltopo/
    branches/ge_components/intern/boolop/
    branches/ge_components/intern/cycles/blender/addon/enums.py
    branches/ge_components/intern/cycles/kernel/kernel_attribute.h
    branches/ge_components/intern/cycles/kernel/osl/nodes/
    branches/ge_components/intern/cycles/kernel/svm/svm_bsdf.h
    branches/ge_components/intern/cycles/util/util_attribute.cpp
    branches/ge_components/intern/cycles/util/util_attribute.h
    branches/ge_components/release/datafiles/blender_icons.png
    branches/ge_components/release/scripts/templates/
    branches/ge_components/source/blender/blenlib/BLI_bpath.h
    branches/ge_components/source/blender/blenlib/BLI_pbvh.h
    branches/ge_components/source/blender/blenlib/intern/bpath.c
    branches/ge_components/source/blender/blenlib/intern/pbvh.c
    branches/ge_components/source/blender/blenloader/BLO_soundfile.h
    branches/ge_components/source/blender/bmesh/intern/bmesh_decimate.h
    branches/ge_components/source/blender/bmesh/intern/bmesh_decimate_collapse.c
    branches/ge_components/source/blender/bmesh/intern/bmesh_decimate_dissolve.c
    branches/ge_components/source/blender/bmesh/intern/bmesh_decimate_unsubdivide.c
    branches/ge_components/source/blender/bmesh/operators/bmo_bevel.c
    branches/ge_components/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
    branches/ge_components/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
    branches/ge_components/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
    branches/ge_components/source/blender/editors/space_text/text_python.c
    branches/ge_components/source/darwin/
    branches/ge_components/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
    branches/ge_components/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
    branches/ge_components/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    branches/ge_components/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h

Property Changed:
----------------
    branches/ge_components/
    branches/ge_components/extern/carve/patches/mingw_w64.patch
    branches/ge_components/extern/libopenjpeg/patches/osx.patch
    branches/ge_components/source/blender/editors/interface/interface.c
    branches/ge_components/source/blender/editors/space_outliner/


Property changes on: branches/ge_components
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bge_components:36315-36316,36318,36331,36389,36540
/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:49306-52165
   + /branches/bge_components:36315-36316,36318,36331,36389,36540
/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:49306-53539

Modified: branches/ge_components/CMakeLists.txt
===================================================================
--- branches/ge_components/CMakeLists.txt	2013-01-04 01:05:41 UTC (rev 53541)
+++ branches/ge_components/CMakeLists.txt	2013-01-04 02:01:50 UTC (rev 53542)
@@ -127,8 +127,10 @@
 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_SYSTEM_BULLET "Use the systems bullet library (currently unsupported due to missing features in upstream!)" )
+mark_as_advanced(WITH_SYSTEM_BULLET)
 option(WITH_GAMEENGINE    "Enable Game Engine" ON)
 option(WITH_PLAYER        "Build Player" OFF)
 option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ON)
@@ -149,7 +151,10 @@
 option(WITH_AUDASPACE    "Build with blenders audio library (only disable if you know what you're doing!)" ON)
 mark_as_advanced(WITH_AUDASPACE)
 
+option(WITH_BOOL_COMPAT "Continue defining \"TRUE\" and \"FALSE\" until these can be replaced with \"true\" and \"false\" from stdbool.h" ON)
+mark_as_advanced(WITH_BOOL_COMPAT)
 
+
 # (unix defaults to OpenMP On)
 if((UNIX AND NOT APPLE) OR (MINGW))
 	set(PLATFORM_DEFAULT ON)
@@ -190,8 +195,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
@@ -234,17 +239,13 @@
 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)
 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)
@@ -268,8 +269,10 @@
 option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
 mark_as_advanced(WITH_ASSERT_ABORT)
 
+if(APPLE)
+	cmake_minimum_required(VERSION 2.8.8)
+	cmake_policy(VERSION 2.8.8)
 
-if(APPLE)
 	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"
@@ -383,10 +386,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)
@@ -428,6 +427,13 @@
 
 TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
 
+TEST_STDBOOL_SUPPORT()
+if(HAVE_STDBOOL_H)
+	add_definitions(-DHAVE_STDBOOL_H)
+endif()
+if(WITH_BOOL_COMPAT)
+	add_definitions(-DWITH_BOOL_COMPAT)
+endif()
 
 #-----------------------------------------------------------------------------
 # Check for valid directories
@@ -486,14 +492,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
@@ -502,50 +508,52 @@
 #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.
+		# No way to set py33. remove for now.
 		# find_package(PythonLibs)
 
 		# 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)
@@ -554,14 +562,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
@@ -575,7 +583,7 @@
 	endif()
 
 	if(WITH_JACK)
-		find_package(Jack)
+		find_package_wrapper(Jack)
 		if(NOT JACK_FOUND)
 			set(WITH_JACK OFF)
 		endif()
@@ -583,22 +591,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)
 
@@ -615,31 +616,31 @@
 	endif()
 
 	if(WITH_FFTW3)
-		find_package(Fftw3)

@@ Diff output truncated at 10240 characters. @@