[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60560] branches/vgroup_modifiers: svn merge -r 57000:58000 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Bastien Montagne montagne29 at wanadoo.fr
Sat Oct 5 12:13:33 CEST 2013


Revision: 60560
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60560
Author:   mont29
Date:     2013-10-05 10:13:32 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
svn merge -r 57000:58000 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/vgroup_modifiers/CMakeLists.txt
    branches/vgroup_modifiers/SConstruct
    branches/vgroup_modifiers/build_files/build_environment/install_deps.sh
    branches/vgroup_modifiers/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
    branches/vgroup_modifiers/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
    branches/vgroup_modifiers/build_files/buildbot/config/user-config-glibc211-i686.py
    branches/vgroup_modifiers/build_files/buildbot/config/user-config-glibc211-x86_64.py
    branches/vgroup_modifiers/build_files/buildbot/config/user-config-mac-i386.py
    branches/vgroup_modifiers/build_files/buildbot/config/user-config-mac-x86_64.py
    branches/vgroup_modifiers/build_files/buildbot/config/user-config-player-glibc211-i686.py
    branches/vgroup_modifiers/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
    branches/vgroup_modifiers/build_files/buildbot/master.cfg
    branches/vgroup_modifiers/build_files/buildbot/slave_compile.py
    branches/vgroup_modifiers/build_files/buildbot/slave_pack.py
    branches/vgroup_modifiers/build_files/buildbot/slave_test.py
    branches/vgroup_modifiers/build_files/cmake/Modules/FindOpenEXR.cmake
    branches/vgroup_modifiers/build_files/cmake/macros.cmake
    branches/vgroup_modifiers/build_files/scons/config/Modules/FindPython.py
    branches/vgroup_modifiers/build_files/scons/config/darwin-config.py
    branches/vgroup_modifiers/build_files/scons/config/linux-config.py
    branches/vgroup_modifiers/build_files/scons/config/linuxcross-config.py
    branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py
    branches/vgroup_modifiers/build_files/scons/config/win32-vc-config.py
    branches/vgroup_modifiers/build_files/scons/config/win64-mingw-config.py
    branches/vgroup_modifiers/build_files/scons/config/win64-vc-config.py
    branches/vgroup_modifiers/build_files/scons/tools/Blender.py
    branches/vgroup_modifiers/build_files/scons/tools/btools.py
    branches/vgroup_modifiers/doc/doxygen/Doxyfile
    branches/vgroup_modifiers/doc/guides/interface_API.txt
    branches/vgroup_modifiers/doc/manpage/blender.1.py
    branches/vgroup_modifiers/doc/python_api/examples/bpy.app.translations.py
    branches/vgroup_modifiers/doc/python_api/examples/mathutils.Vector.py
    branches/vgroup_modifiers/doc/python_api/rst/info_gotcha.rst
    branches/vgroup_modifiers/extern/carve/include/carve/win32.h
    branches/vgroup_modifiers/extern/libmv/CMakeLists.txt
    branches/vgroup_modifiers/extern/libmv/ChangeLog
    branches/vgroup_modifiers/extern/libmv/files.txt
    branches/vgroup_modifiers/extern/libmv/libmv/tracking/track_region.h
    branches/vgroup_modifiers/extern/libmv/libmv-capi.cc
    branches/vgroup_modifiers/extern/libmv/libmv-capi.h
    branches/vgroup_modifiers/extern/libmv/libmv-capi_stub.cc
    branches/vgroup_modifiers/intern/audaspace/intern/AUD_Sequencer.cpp
    branches/vgroup_modifiers/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/vgroup_modifiers/intern/audaspace/jack/AUD_JackLibrary.cpp
    branches/vgroup_modifiers/intern/audaspace/jack/AUD_JackLibrary.h
    branches/vgroup_modifiers/intern/container/CTR_TaggedIndex.h
    branches/vgroup_modifiers/intern/cycles/CMakeLists.txt
    branches/vgroup_modifiers/intern/cycles/SConscript
    branches/vgroup_modifiers/intern/cycles/blender/CMakeLists.txt
    branches/vgroup_modifiers/intern/cycles/blender/addon/__init__.py
    branches/vgroup_modifiers/intern/cycles/blender/addon/properties.py
    branches/vgroup_modifiers/intern/cycles/blender/addon/ui.py
    branches/vgroup_modifiers/intern/cycles/blender/blender_curves.cpp
    branches/vgroup_modifiers/intern/cycles/blender/blender_object.cpp
    branches/vgroup_modifiers/intern/cycles/blender/blender_python.cpp
    branches/vgroup_modifiers/intern/cycles/blender/blender_session.cpp
    branches/vgroup_modifiers/intern/cycles/blender/blender_shader.cpp
    branches/vgroup_modifiers/intern/cycles/blender/blender_sync.cpp
    branches/vgroup_modifiers/intern/cycles/blender/blender_sync.h
    branches/vgroup_modifiers/intern/cycles/bvh/bvh.cpp
    branches/vgroup_modifiers/intern/cycles/device/device_cuda.cpp
    branches/vgroup_modifiers/intern/cycles/device/device_opencl.cpp
    branches/vgroup_modifiers/intern/cycles/kernel/CMakeLists.txt
    branches/vgroup_modifiers/intern/cycles/kernel/SConscript
    branches/vgroup_modifiers/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
    branches/vgroup_modifiers/intern/cycles/kernel/closure/bsdf_phong_ramp.h
    branches/vgroup_modifiers/intern/cycles/kernel/closure/bsdf_reflection.h
    branches/vgroup_modifiers/intern/cycles/kernel/closure/bsdf_util.h
    branches/vgroup_modifiers/intern/cycles/kernel/closure/bssrdf.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel.cl
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_accumulate.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_bvh.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_bvh_traversal.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_camera.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_compat_cpu.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_compat_opencl.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_curve.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_displace.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_emission.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_globals.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_light.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_montecarlo.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_object.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_passes.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_path.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_projection.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_random.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_shader.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_sse2.cpp
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_sse3.cpp
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_types.h
    branches/vgroup_modifiers/intern/cycles/kernel/osl/osl_closures.cpp
    branches/vgroup_modifiers/intern/cycles/kernel/osl/osl_services.cpp
    branches/vgroup_modifiers/intern/cycles/kernel/osl/osl_services.h
    branches/vgroup_modifiers/intern/cycles/kernel/osl/osl_shader.cpp
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/CMakeLists.txt
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/SConscript
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_brick_texture.osl
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_bump.osl
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_color.h
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_environment_texture.osl
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_fresnel.h
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_fresnel.osl
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_glass_bsdf.osl
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_image_texture.osl
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_layer_weight.osl
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_normal_map.osl
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_sky_texture.osl
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_texture.h
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_texture_coordinate.osl
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_toon_bsdf.osl
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_wireframe.osl
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/stdosl.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_brick.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_checker.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_closure.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_convert.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_fresnel.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_hsv.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_image.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_mix.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_musgrave.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_noise.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_ramp.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_sky.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_tex_coord.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_texture.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_types.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_value.h
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_wireframe.h
    branches/vgroup_modifiers/intern/cycles/render/background.cpp
    branches/vgroup_modifiers/intern/cycles/render/background.h
    branches/vgroup_modifiers/intern/cycles/render/film.cpp
    branches/vgroup_modifiers/intern/cycles/render/film.h
    branches/vgroup_modifiers/intern/cycles/render/graph.cpp
    branches/vgroup_modifiers/intern/cycles/render/graph.h
    branches/vgroup_modifiers/intern/cycles/render/integrator.cpp
    branches/vgroup_modifiers/intern/cycles/render/integrator.h
    branches/vgroup_modifiers/intern/cycles/render/light.cpp
    branches/vgroup_modifiers/intern/cycles/render/light.h
    branches/vgroup_modifiers/intern/cycles/render/nodes.cpp
    branches/vgroup_modifiers/intern/cycles/render/nodes.h
    branches/vgroup_modifiers/intern/cycles/render/object.cpp
    branches/vgroup_modifiers/intern/cycles/render/osl.cpp
    branches/vgroup_modifiers/intern/cycles/render/scene.h
    branches/vgroup_modifiers/intern/cycles/render/session.cpp
    branches/vgroup_modifiers/intern/cycles/render/shader.cpp
    branches/vgroup_modifiers/intern/cycles/render/shader.h
    branches/vgroup_modifiers/intern/cycles/render/svm.cpp
    branches/vgroup_modifiers/intern/cycles/util/util_color.h
    branches/vgroup_modifiers/intern/cycles/util/util_cuda.cpp
    branches/vgroup_modifiers/intern/cycles/util/util_cuda.h
    branches/vgroup_modifiers/intern/cycles/util/util_math.h
    branches/vgroup_modifiers/intern/cycles/util/util_opencl.cpp
    branches/vgroup_modifiers/intern/cycles/util/util_path.cpp
    branches/vgroup_modifiers/intern/cycles/util/util_path.h
    branches/vgroup_modifiers/intern/cycles/util/util_system.cpp
    branches/vgroup_modifiers/intern/cycles/util/util_task.cpp
    branches/vgroup_modifiers/intern/cycles/util/util_time.cpp
    branches/vgroup_modifiers/intern/cycles/util/util_types.h
    branches/vgroup_modifiers/intern/cycles/util/util_vector.h
    branches/vgroup_modifiers/intern/ghost/CMakeLists.txt
    branches/vgroup_modifiers/intern/ghost/SConscript
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowWin32.h
    branches/vgroup_modifiers/intern/ghost/test/CMakeLists.txt
    branches/vgroup_modifiers/intern/guardedalloc/CMakeLists.txt
    branches/vgroup_modifiers/intern/guardedalloc/MEM_guardedalloc.h
    branches/vgroup_modifiers/intern/guardedalloc/intern/mallocn.c
    branches/vgroup_modifiers/intern/guardedalloc/mmap_win.h
    branches/vgroup_modifiers/intern/guardedalloc/test/simpletest/memtest.c
    branches/vgroup_modifiers/intern/locale/boost_locale_wrapper.cpp
    branches/vgroup_modifiers/intern/memutil/MEM_Allocator.h
    branches/vgroup_modifiers/intern/opennl/CMakeLists.txt
    branches/vgroup_modifiers/intern/opennl/superlu/smemory.c
    branches/vgroup_modifiers/release/datafiles/blender_icons.svg
    branches/vgroup_modifiers/release/datafiles/blender_icons16.png
    branches/vgroup_modifiers/release/datafiles/blender_icons32.png
    branches/vgroup_modifiers/release/datafiles/splash.png
    branches/vgroup_modifiers/release/datafiles/startup.blend
    branches/vgroup_modifiers/release/scripts/freestyle/style_modules/parameter_editor.py
    branches/vgroup_modifiers/release/scripts/modules/addon_utils.py
    branches/vgroup_modifiers/release/scripts/modules/bl_i18n_utils/settings.py
    branches/vgroup_modifiers/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
    branches/vgroup_modifiers/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
    branches/vgroup_modifiers/release/scripts/modules/bpy/utils.py
    branches/vgroup_modifiers/release/scripts/modules/bpy_extras/object_utils.py
    branches/vgroup_modifiers/release/scripts/modules/bpy_types.py
    branches/vgroup_modifiers/release/scripts/modules/console/complete_namespace.py
    branches/vgroup_modifiers/release/scripts/modules/nodeitems_utils.py
    branches/vgroup_modifiers/release/scripts/presets/interface_theme/back_to_black.xml
    branches/vgroup_modifiers/release/scripts/presets/interface_theme/blender_24x.xml
    branches/vgroup_modifiers/release/scripts/presets/interface_theme/elsyiun.xml
    branches/vgroup_modifiers/release/scripts/presets/interface_theme/hexagon.xml
    branches/vgroup_modifiers/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
    branches/vgroup_modifiers/release/scripts/presets/keyconfig/3dsmax.py
    branches/vgroup_modifiers/release/scripts/presets/keyconfig/maya.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/anim.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/freestyle.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/mesh.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/node.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/presets.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/view3d.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/wm.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/__init__.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_freestyle.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_game.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_mask_common.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_paint_common.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_particle.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_render.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_clip.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_image.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_info.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_node.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_userpref.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/vgroup_modifiers/release/scripts/startup/nodeitems_builtins.py
    branches/vgroup_modifiers/release/scripts/templates_osl/ramp_closure.osl
    branches/vgroup_modifiers/release/scripts/templates_osl/temperature_to_rgb.osl
    branches/vgroup_modifiers/release/scripts/templates_osl/wavelength_to_rgb.osl
    branches/vgroup_modifiers/release/scripts/templates_osl/westin_closure.osl
    branches/vgroup_modifiers/release/scripts/templates_py/custom_nodes.py
    branches/vgroup_modifiers/release/text/readme.html
    branches/vgroup_modifiers/scons/scons-time.py
    branches/vgroup_modifiers/scons/scons.py
    branches/vgroup_modifiers/scons/sconsign.py
    branches/vgroup_modifiers/source/blender/avi/AVI_avi.h
    branches/vgroup_modifiers/source/blender/avi/intern/avi.c
    branches/vgroup_modifiers/source/blender/blenfont/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/blenfont/SConscript
    branches/vgroup_modifiers/source/blender/blenfont/intern/blf.c
    branches/vgroup_modifiers/source/blender/blenfont/intern/blf_dir.c
    branches/vgroup_modifiers/source/blender/blenfont/intern/blf_font.c
    branches/vgroup_modifiers/source/blender/blenfont/intern/blf_glyph.c
    branches/vgroup_modifiers/source/blender/blenfont/intern/blf_internal.h
    branches/vgroup_modifiers/source/blender/blenfont/intern/blf_internal_types.h
    branches/vgroup_modifiers/source/blender/blenfont/intern/blf_lang.c
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_blender.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_bmesh.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_bpath.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_brush.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_cdderivedmesh.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_cloth.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_customdata.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_deform.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_displist.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_global.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_idprop.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_lattice.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_mask.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_mball.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_mesh.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_modifier.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_node.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_object.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_ocean.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_particle.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_pbvh.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_report.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_scene.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_screen.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_sequencer.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_speaker.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_text.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_texture.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_tracking.h
    branches/vgroup_modifiers/source/blender/blenkernel/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/CCGSubSurf.h
    branches/vgroup_modifiers/source/blender/blenkernel/intern/DerivedMesh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/anim.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/anim_sys.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/armature.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/blender.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/bmfont.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/bpath.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/brush.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/camera.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/colortools.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/constraint.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/context.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/customdata.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/deform.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/depsgraph.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/displist.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/dynamicpaint.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/editderivedmesh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/editmesh_bvh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/effect.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/fcurve.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/icons.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/image.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/image_gen.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/key.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/lattice.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/library.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/mask.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/mask_rasterize.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/material.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/mball.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh_validate.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/modifier.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/multires.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/nla.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/node.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/object.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/packedFile.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/paint.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/particle.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/particle_system.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/pbvh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/rigidbody.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/scene.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/seqcache.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/sequencer.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/smoke.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/speaker.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/text.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/texture.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/tracking.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/unit.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/writeffmpeg.c
    branches/vgroup_modifiers/source/blender/blenlib/BLI_array.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_callbacks.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_edgehash.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_ghash.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_heap.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_kdtree.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_math_geom.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_math_matrix.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_math_rotation.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_math_vector.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_path_util.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_rect.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_scanfill.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_smallhash.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_string.h
    branches/vgroup_modifiers/source/blender/blenlib/BLI_utildefines.h
    branches/vgroup_modifiers/source/blender/blenlib/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_ghash.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_heap.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_kdtree.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_memarena.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_mempool.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/edgehash.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/endian_switch.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/fileops.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/graph.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/listbase.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/math_color.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/math_color_inline.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/math_geom.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/math_interp.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/math_matrix.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/math_rotation.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/math_vector.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/math_vector_inline.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/path_util.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/rct.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/scanfill.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/smallhash.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/string.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/winstuff.c
    branches/vgroup_modifiers/source/blender/blenloader/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/blenloader/SConscript
    branches/vgroup_modifiers/source/blender/blenloader/intern/readblenentry.c
    branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c
    branches/vgroup_modifiers/source/blender/blenloader/intern/versioning_250.c
    branches/vgroup_modifiers/source/blender/blenloader/intern/writefile.c
    branches/vgroup_modifiers/source/blender/bmesh/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/bmesh/bmesh.h
    branches/vgroup_modifiers/source/blender/bmesh/bmesh_class.h
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_construct.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_core.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_edgeloop.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_edgeloop.h
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_interp.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_iterators.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_iterators.h
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_iterators_inline.h
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_marking.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_marking.h
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_mesh.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_mesh_conv.h
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_operators.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_operators.h
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_polygon.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_polygon.h
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_walkers.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_beautify.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_bridge.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_connect.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_dissolve.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_dupe.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_edgenet.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_extrude.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_fill_grid.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_mesh_conv.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_mirror.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_poke.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_similar.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_subdivide.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_subdivide_edgering.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_utils.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_wireframe.c
    branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_bevel.c
    branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_decimate.h
    branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_decimate_collapse.c
    branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
    branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
    branches/vgroup_modifiers/source/blender/collada/AnimationExporter.cpp
    branches/vgroup_modifiers/source/blender/collada/AnimationExporter.h
    branches/vgroup_modifiers/source/blender/collada/AnimationImporter.cpp
    branches/vgroup_modifiers/source/blender/collada/ArmatureExporter.cpp
    branches/vgroup_modifiers/source/blender/collada/ArmatureImporter.cpp
    branches/vgroup_modifiers/source/blender/collada/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/collada/ControllerExporter.cpp
    branches/vgroup_modifiers/source/blender/collada/DocumentImporter.cpp
    branches/vgroup_modifiers/source/blender/collada/GeometryExporter.cpp
    branches/vgroup_modifiers/source/blender/collada/MeshImporter.cpp
    branches/vgroup_modifiers/source/blender/collada/SConscript
    branches/vgroup_modifiers/source/blender/collada/SkinInfo.cpp
    branches/vgroup_modifiers/source/blender/collada/TransformReader.cpp
    branches/vgroup_modifiers/source/blender/collada/TransformWriter.cpp
    branches/vgroup_modifiers/source/blender/collada/collada_utils.cpp
    branches/vgroup_modifiers/source/blender/compositor/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/compositor/SConscript
    branches/vgroup_modifiers/source/blender/compositor/intern/COM_compositor.cpp
    branches/vgroup_modifiers/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/vgroup_modifiers/source/blender/compositor/nodes/COM_MixNode.cpp
    branches/vgroup_modifiers/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_BilateralBlurOperation.h
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_BokehBlurOperation.h
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixBaseOperation.cpp
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_MixBaseOperation.h
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_MovieClipOperation.cpp
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_TrackPositionOperation.h
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_WrapOperation.cpp
    branches/vgroup_modifiers/source/blender/editors/animation/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/animation/SConscript
    branches/vgroup_modifiers/source/blender/editors/animation/anim_draw.c
    branches/vgroup_modifiers/source/blender/editors/animation/anim_filter.c
    branches/vgroup_modifiers/source/blender/editors/animation/anim_markers.c
    branches/vgroup_modifiers/source/blender/editors/animation/anim_ops.c
    branches/vgroup_modifiers/source/blender/editors/animation/fmodifier_ui.c
    branches/vgroup_modifiers/source/blender/editors/animation/keyframes_general.c
    branches/vgroup_modifiers/source/blender/editors/animation/keyframing.c
    branches/vgroup_modifiers/source/blender/editors/armature/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/armature/SConscript
    branches/vgroup_modifiers/source/blender/editors/armature/armature_add.c
    branches/vgroup_modifiers/source/blender/editors/armature/armature_ops.c
    branches/vgroup_modifiers/source/blender/editors/armature/armature_relations.c
    branches/vgroup_modifiers/source/blender/editors/armature/armature_skinning.c
    branches/vgroup_modifiers/source/blender/editors/armature/editarmature_generate.c
    branches/vgroup_modifiers/source/blender/editors/armature/meshlaplacian.c
    branches/vgroup_modifiers/source/blender/editors/armature/meshlaplacian.h
    branches/vgroup_modifiers/source/blender/editors/curve/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/curve/SConscript
    branches/vgroup_modifiers/source/blender/editors/curve/curve_ops.c
    branches/vgroup_modifiers/source/blender/editors/curve/editcurve.c
    branches/vgroup_modifiers/source/blender/editors/curve/editfont.c
    branches/vgroup_modifiers/source/blender/editors/curve/lorem.c
    branches/vgroup_modifiers/source/blender/editors/gpencil/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/gpencil/SConscript
    branches/vgroup_modifiers/source/blender/editors/gpencil/drawgpencil.c
    branches/vgroup_modifiers/source/blender/editors/gpencil/gpencil_edit.c
    branches/vgroup_modifiers/source/blender/editors/gpencil/gpencil_ops.c
    branches/vgroup_modifiers/source/blender/editors/gpencil/gpencil_paint.c
    branches/vgroup_modifiers/source/blender/editors/include/ED_armature.h
    branches/vgroup_modifiers/source/blender/editors/include/ED_mesh.h
    branches/vgroup_modifiers/source/blender/editors/include/ED_object.h
    branches/vgroup_modifiers/source/blender/editors/include/ED_screen.h
    branches/vgroup_modifiers/source/blender/editors/include/ED_transform.h
    branches/vgroup_modifiers/source/blender/editors/include/ED_view3d.h
    branches/vgroup_modifiers/source/blender/editors/include/UI_icons.h
    branches/vgroup_modifiers/source/blender/editors/include/UI_interface.h
    branches/vgroup_modifiers/source/blender/editors/include/UI_resources.h
    branches/vgroup_modifiers/source/blender/editors/include/UI_view2d.h
    branches/vgroup_modifiers/source/blender/editors/interface/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/interface/SConscript
    branches/vgroup_modifiers/source/blender/editors/interface/interface.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_draw.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_handlers.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_intern.h
    branches/vgroup_modifiers/source/blender/editors/interface/interface_layout.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_ops.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_panel.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_regions.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_style.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_templates.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_utils.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_widgets.c
    branches/vgroup_modifiers/source/blender/editors/interface/resources.c
    branches/vgroup_modifiers/source/blender/editors/interface/view2d.c
    branches/vgroup_modifiers/source/blender/editors/interface/view2d_ops.c
    branches/vgroup_modifiers/source/blender/editors/io/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/io/SConscript
    branches/vgroup_modifiers/source/blender/editors/mask/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/mask/SConscript
    branches/vgroup_modifiers/source/blender/editors/mask/mask_ops.c
    branches/vgroup_modifiers/source/blender/editors/mask/mask_shapekey.c
    branches/vgroup_modifiers/source/blender/editors/mesh/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/mesh/SConscript
    branches/vgroup_modifiers/source/blender/editors/mesh/editface.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_add.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_bevel.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_extrude.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_inset.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_knife.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_loopcut.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_rip.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_select.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_tools.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_utils.c
    branches/vgroup_modifiers/source/blender/editors/mesh/mesh_data.c
    branches/vgroup_modifiers/source/blender/editors/mesh/mesh_intern.h
    branches/vgroup_modifiers/source/blender/editors/mesh/mesh_navmesh.c
    branches/vgroup_modifiers/source/blender/editors/mesh/mesh_ops.c
    branches/vgroup_modifiers/source/blender/editors/mesh/meshtools.c
    branches/vgroup_modifiers/source/blender/editors/metaball/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/metaball/SConscript
    branches/vgroup_modifiers/source/blender/editors/metaball/mball_ops.c
    branches/vgroup_modifiers/source/blender/editors/object/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/object/SConscript
    branches/vgroup_modifiers/source/blender/editors/object/object_add.c
    branches/vgroup_modifiers/source/blender/editors/object/object_bake.c
    branches/vgroup_modifiers/source/blender/editors/object/object_constraint.c
    branches/vgroup_modifiers/source/blender/editors/object/object_edit.c
    branches/vgroup_modifiers/source/blender/editors/object/object_group.c
    branches/vgroup_modifiers/source/blender/editors/object/object_hook.c
    branches/vgroup_modifiers/source/blender/editors/object/object_intern.h
    branches/vgroup_modifiers/source/blender/editors/object/object_lattice.c
    branches/vgroup_modifiers/source/blender/editors/object/object_ops.c
    branches/vgroup_modifiers/source/blender/editors/object/object_relations.c
    branches/vgroup_modifiers/source/blender/editors/object/object_shapekey.c
    branches/vgroup_modifiers/source/blender/editors/object/object_transform.c
    branches/vgroup_modifiers/source/blender/editors/object/object_vgroup.c
    branches/vgroup_modifiers/source/blender/editors/physics/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/physics/SConscript
    branches/vgroup_modifiers/source/blender/editors/physics/particle_object.c
    branches/vgroup_modifiers/source/blender/editors/physics/physics_ops.c
    branches/vgroup_modifiers/source/blender/editors/render/render_internal.c
    branches/vgroup_modifiers/source/blender/editors/render/render_opengl.c
    branches/vgroup_modifiers/source/blender/editors/render/render_update.c
    branches/vgroup_modifiers/source/blender/editors/screen/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/screen/SConscript
    branches/vgroup_modifiers/source/blender/editors/screen/area.c
    branches/vgroup_modifiers/source/blender/editors/screen/screen_edit.c
    branches/vgroup_modifiers/source/blender/editors/screen/screen_ops.c
    branches/vgroup_modifiers/source/blender/editors/screen/screendump.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/SConscript
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_hide.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image_proj.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_intern.h
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_mask.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_ops.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_utils.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/sculpt.c
    branches/vgroup_modifiers/source/blender/editors/sound/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/sound/SConscript
    branches/vgroup_modifiers/source/blender/editors/sound/sound_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_action/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_action/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_action/space_action.c
    branches/vgroup_modifiers/source/blender/editors/space_api/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_api/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_api/spacetypes.c
    branches/vgroup_modifiers/source/blender/editors/space_buttons/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_buttons/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_buttons/buttons_intern.h
    branches/vgroup_modifiers/source/blender/editors/space_buttons/buttons_texture.c
    branches/vgroup_modifiers/source/blender/editors/space_buttons/space_buttons.c
    branches/vgroup_modifiers/source/blender/editors/space_clip/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_clip/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_clip/clip_buttons.c
    branches/vgroup_modifiers/source/blender/editors/space_clip/clip_dopesheet_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_clip/clip_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_clip/clip_intern.h
    branches/vgroup_modifiers/source/blender/editors/space_clip/space_clip.c
    branches/vgroup_modifiers/source/blender/editors/space_clip/tracking_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_console/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_console/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_console/space_console.c
    branches/vgroup_modifiers/source/blender/editors/space_file/file_intern.h
    branches/vgroup_modifiers/source/blender/editors/space_file/filesel.c
    branches/vgroup_modifiers/source/blender/editors/space_file/space_file.c
    branches/vgroup_modifiers/source/blender/editors/space_graph/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_graph/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_graph/graph_buttons.c
    branches/vgroup_modifiers/source/blender/editors/space_graph/graph_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_graph/graph_edit.c
    branches/vgroup_modifiers/source/blender/editors/space_graph/space_graph.c
    branches/vgroup_modifiers/source/blender/editors/space_image/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_image/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_image/image_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_image/image_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_image/space_image.c
    branches/vgroup_modifiers/source/blender/editors/space_info/info_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_info/space_info.c
    branches/vgroup_modifiers/source/blender/editors/space_logic/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_logic/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_logic/logic_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_logic/space_logic.c
    branches/vgroup_modifiers/source/blender/editors/space_nla/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_nla/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_nla/nla_channels.c
    branches/vgroup_modifiers/source/blender/editors/space_nla/nla_edit.c
    branches/vgroup_modifiers/source/blender/editors/space_nla/nla_intern.h
    branches/vgroup_modifiers/source/blender/editors/space_nla/nla_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_nla/space_nla.c
    branches/vgroup_modifiers/source/blender/editors/space_node/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_node/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_node/drawnode.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_add.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_buttons.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_edit.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_group.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_intern.h
    branches/vgroup_modifiers/source/blender/editors/space_node/node_relationships.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_templates.c
    branches/vgroup_modifiers/source/blender/editors/space_node/space_node.c
    branches/vgroup_modifiers/source/blender/editors/space_outliner/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_outliner/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_edit.c
    branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_intern.h
    branches/vgroup_modifiers/source/blender/editors/space_outliner/space_outliner.c
    branches/vgroup_modifiers/source/blender/editors/space_script/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_script/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_script/script_edit.c
    branches/vgroup_modifiers/source/blender/editors/space_script/script_intern.h
    branches/vgroup_modifiers/source/blender/editors/space_script/script_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_script/space_script.c
    branches/vgroup_modifiers/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_sequencer/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_add.c
    branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_sequencer/space_sequencer.c
    branches/vgroup_modifiers/source/blender/editors/space_text/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_text/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_text/space_text.c
    branches/vgroup_modifiers/source/blender/editors/space_text/text_autocomplete.c
    branches/vgroup_modifiers/source/blender/editors/space_text/text_format_lua.c
    branches/vgroup_modifiers/source/blender/editors/space_text/text_format_osl.c
    branches/vgroup_modifiers/source/blender/editors/space_text/text_format_py.c
    branches/vgroup_modifiers/source/blender/editors/space_text/text_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_time/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_time/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_time/space_time.c
    branches/vgroup_modifiers/source/blender/editors/space_userpref/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_userpref/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_userpref/space_userpref.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/space_view3d/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_view3d/drawanimviz.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/drawarmature.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/drawmesh.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/drawobject.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/space_view3d.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_buttons.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_edit.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_fly.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_intern.h
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_iterators.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_project.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_select.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_snap.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_view.c
    branches/vgroup_modifiers/source/blender/editors/transform/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/transform/SConscript
    branches/vgroup_modifiers/source/blender/editors/transform/transform.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform.h
    branches/vgroup_modifiers/source/blender/editors/transform/transform_conversions.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform_generics.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform_manipulator.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform_ops.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform_orientations.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform_snap.c
    branches/vgroup_modifiers/source/blender/editors/util/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/util/SConscript
    branches/vgroup_modifiers/source/blender/editors/util/numinput.c
    branches/vgroup_modifiers/source/blender/editors/util/undo.c
    branches/vgroup_modifiers/source/blender/editors/uvedit/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/uvedit/SConscript
    branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_draw.c
    branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_ops.c
    branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/vgroup_modifiers/source/blender/freestyle/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/freestyle/FRS_freestyle.h
    branches/vgroup_modifiers/source/blender/freestyle/SConscript
    branches/vgroup_modifiers/source/blender/freestyle/intern/application/AppCanvas.cpp
    branches/vgroup_modifiers/source/blender/freestyle/intern/application/Controller.cpp
    branches/vgroup_modifiers/source/blender/freestyle/intern/application/Controller.h
    branches/vgroup_modifiers/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
    branches/vgroup_modifiers/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
    branches/vgroup_modifiers/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
    branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/FitCurve.cpp
    branches/vgroup_modifiers/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
    branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/StrokeIterators.h
    branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/StrokeRep.cpp
    branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/Silhouette.h
    branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/SteerableViewMap.h
    branches/vgroup_modifiers/source/blender/gpu/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/gpu/SConscript
    branches/vgroup_modifiers/source/blender/gpu/intern/gpu_buffers.c
    branches/vgroup_modifiers/source/blender/gpu/intern/gpu_codegen.c
    branches/vgroup_modifiers/source/blender/gpu/intern/gpu_draw.c
    branches/vgroup_modifiers/source/blender/gpu/intern/gpu_extensions.c
    branches/vgroup_modifiers/source/blender/gpu/intern/gpu_material.c
    branches/vgroup_modifiers/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/vgroup_modifiers/source/blender/ikplugin/intern/ikplugin_api.c
    branches/vgroup_modifiers/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/vgroup_modifiers/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/vgroup_modifiers/source/blender/imbuf/IMB_imbuf_types.h
    branches/vgroup_modifiers/source/blender/imbuf/intern/cineon/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/imbuf/intern/cineon/SConscript
    branches/vgroup_modifiers/source/blender/imbuf/intern/cineon/cineon_dpx.c
    branches/vgroup_modifiers/source/blender/imbuf/intern/cineon/logImageCore.h
    branches/vgroup_modifiers/source/blender/imbuf/intern/colormanagement.c
    branches/vgroup_modifiers/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/vgroup_modifiers/source/blender/imbuf/intern/dds/FlipDXT.h
    branches/vgroup_modifiers/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/vgroup_modifiers/source/blender/imbuf/intern/png.c
    branches/vgroup_modifiers/source/blender/imbuf/intern/scaling.c
    branches/vgroup_modifiers/source/blender/imbuf/intern/thumbs.c
    branches/vgroup_modifiers/source/blender/imbuf/intern/util.c
    branches/vgroup_modifiers/source/blender/makesdna/DNA_action_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_anim_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_armature_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_defs.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_image_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_key_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_lamp_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_lattice_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_material_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_mesh_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_meshdata_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_modifier_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_nla_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_node_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_particle_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_property_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_scene_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_screen_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_space_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_text_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_tracking_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_userdef_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_world_types.h
    branches/vgroup_modifiers/source/blender/makesdna/intern/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/makesdna/intern/SConscript
    branches/vgroup_modifiers/source/blender/makesdna/intern/makesdna.c
    branches/vgroup_modifiers/source/blender/makesrna/RNA_access.h
    branches/vgroup_modifiers/source/blender/makesrna/RNA_enum_types.h
    branches/vgroup_modifiers/source/blender/makesrna/RNA_types.h
    branches/vgroup_modifiers/source/blender/makesrna/SConscript
    branches/vgroup_modifiers/source/blender/makesrna/intern/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/makesrna/intern/SConscript
    branches/vgroup_modifiers/source/blender/makesrna/intern/makesrna.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_access.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_action.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_armature.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_brush.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_curve.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_define.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_image.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_internal.h
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_key.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_lamp.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_lattice.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_main_api.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_mask.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_material.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_mesh.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_mesh_api.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_mesh_utils.h
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_meta.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_meta_api.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_modifier.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_nodetree.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_object.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_particle.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_pose_api.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_render.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene_api.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_screen.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_space.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_tracking.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_userdef.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_wm.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_wm_api.c
    branches/vgroup_modifiers/source/blender/modifiers/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/modifiers/SConscript
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_armature.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_array.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_bevel.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_boolean.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_build.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_cast.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_cloth.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_collision.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_curve.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_decimate.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_displace.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_dynamicpaint.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_explode.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_fluidsim.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_hook.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_laplaciansmooth.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_lattice.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_mask.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_meshcache.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_meshcache_mdd.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_meshcache_pc2.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_mirror.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_multires.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_none.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_ocean.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_remesh.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_screw.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_shrinkwrap.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_skin.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_smoke.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_smooth.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_softbody.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_solidify.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_subsurf.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_surface.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_triangulate.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_util.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_uvproject.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_uvwarp.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_warp.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_wave.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/vgroup_modifiers/source/blender/nodes/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/nodes/NOD_composite.h
    branches/vgroup_modifiers/source/blender/nodes/NOD_shader.h
    branches/vgroup_modifiers/source/blender/nodes/NOD_static_types.h
    branches/vgroup_modifiers/source/blender/nodes/SConscript
    branches/vgroup_modifiers/source/blender/nodes/composite/node_composite_tree.c
    branches/vgroup_modifiers/source/blender/nodes/composite/node_composite_util.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_boxmask.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_despeckle.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_inpaint.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_keying.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_mapRange.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_mask.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_pixelate.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_switch.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_trackpos.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/vgroup_modifiers/source/blender/nodes/intern/node_common.c
    branches/vgroup_modifiers/source/blender/nodes/intern/node_exec.c
    branches/vgroup_modifiers/source/blender/nodes/intern/node_socket.c
    branches/vgroup_modifiers/source/blender/nodes/intern/node_util.c
    branches/vgroup_modifiers/source/blender/nodes/shader/node_shader_tree.c
    branches/vgroup_modifiers/source/blender/nodes/shader/node_shader_util.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_attribute.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_brightness.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bump.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_common.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_gamma.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_geometry.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_invert.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_normal.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_normal_map.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_rgb.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_script.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tangent.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_value.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_wireframe.c
    branches/vgroup_modifiers/source/blender/nodes/texture/node_texture_tree.c
    branches/vgroup_modifiers/source/blender/nodes/texture/node_texture_util.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_bricks.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_checker.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_coord.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_curves.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_distance.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_invert.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_math.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_rotate.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_scale.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_translate.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_valToNor.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/vgroup_modifiers/source/blender/python/BPY_extern.h
    branches/vgroup_modifiers/source/blender/python/bmesh/bmesh_py_api.c
    branches/vgroup_modifiers/source/blender/python/bmesh/bmesh_py_types.c
    branches/vgroup_modifiers/source/blender/python/generic/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/python/generic/bgl.c
    branches/vgroup_modifiers/source/blender/python/generic/bgl.h
    branches/vgroup_modifiers/source/blender/python/generic/bpy_internal_import.c
    branches/vgroup_modifiers/source/blender/python/generic/bpy_internal_import.h
    branches/vgroup_modifiers/source/blender/python/intern/bpy.c
    branches/vgroup_modifiers/source/blender/python/intern/bpy_app.c
    branches/vgroup_modifiers/source/blender/python/intern/bpy_driver.c
    branches/vgroup_modifiers/source/blender/python/intern/bpy_interface.c
    branches/vgroup_modifiers/source/blender/python/intern/bpy_rna.c
    branches/vgroup_modifiers/source/blender/python/intern/bpy_rna_array.c
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils.c
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils.h
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Color.h
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Euler.c
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Euler.h
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Matrix.c
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Matrix.h
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Quaternion.h
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Vector.c
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Vector.h
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_geometry.c
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_geometry.h
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_noise.c
    branches/vgroup_modifiers/source/blender/quicktime/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/quicktime/SConscript
    branches/vgroup_modifiers/source/blender/quicktime/apple/qtkit_export.m
    branches/vgroup_modifiers/source/blender/quicktime/apple/qtkit_import.m
    branches/vgroup_modifiers/source/blender/quicktime/apple/quicktime_export.c
    branches/vgroup_modifiers/source/blender/quicktime/apple/quicktime_import.c
    branches/vgroup_modifiers/source/blender/render/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/render/SConscript
    branches/vgroup_modifiers/source/blender/render/extern/include/RE_engine.h
    branches/vgroup_modifiers/source/blender/render/extern/include/RE_pipeline.h
    branches/vgroup_modifiers/source/blender/render/intern/include/render_types.h
    branches/vgroup_modifiers/source/blender/render/intern/include/strand.h
    branches/vgroup_modifiers/source/blender/render/intern/source/bake.c
    branches/vgroup_modifiers/source/blender/render/intern/source/convertblender.c
    branches/vgroup_modifiers/source/blender/render/intern/source/envmap.c
    branches/vgroup_modifiers/source/blender/render/intern/source/external_engine.c
    branches/vgroup_modifiers/source/blender/render/intern/source/initrender.c
    branches/vgroup_modifiers/source/blender/render/intern/source/pipeline.c
    branches/vgroup_modifiers/source/blender/render/intern/source/pointdensity.c
    branches/vgroup_modifiers/source/blender/render/intern/source/render_texture.c
    branches/vgroup_modifiers/source/blender/render/intern/source/shadbuf.c
    branches/vgroup_modifiers/source/blender/render/intern/source/shadeinput.c
    branches/vgroup_modifiers/source/blender/render/intern/source/shadeoutput.c
    branches/vgroup_modifiers/source/blender/render/intern/source/sss.c
    branches/vgroup_modifiers/source/blender/render/intern/source/strand.c
    branches/vgroup_modifiers/source/blender/render/intern/source/volumetric.c
    branches/vgroup_modifiers/source/blender/render/intern/source/voxeldata.c
    branches/vgroup_modifiers/source/blender/render/intern/source/zbuf.c
    branches/vgroup_modifiers/source/blender/windowmanager/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/windowmanager/SConscript
    branches/vgroup_modifiers/source/blender/windowmanager/WM_api.h
    branches/vgroup_modifiers/source/blender/windowmanager/WM_types.h
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm.c
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_cursors.c
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_event_system.c
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_files.c
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_init_exit.c
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_keymap.c
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_operators.c
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_playanim.c
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_window.c
    branches/vgroup_modifiers/source/blender/windowmanager/wm_event_types.h
    branches/vgroup_modifiers/source/blender/windowmanager/wm_subwindow.h
    branches/vgroup_modifiers/source/blenderplayer/bad_level_call_stubs/SConscript
    branches/vgroup_modifiers/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/vgroup_modifiers/source/creator/CMakeLists.txt
    branches/vgroup_modifiers/source/creator/creator.c
    branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/vgroup_modifiers/source/gameengine/BlenderRoutines/SConscript
    branches/vgroup_modifiers/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/vgroup_modifiers/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/vgroup_modifiers/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/vgroup_modifiers/source/gameengine/Converter/SConscript
    branches/vgroup_modifiers/source/gameengine/Expressions/CMakeLists.txt
    branches/vgroup_modifiers/source/gameengine/Expressions/ListValue.cpp
    branches/vgroup_modifiers/source/gameengine/Expressions/SConscript
    branches/vgroup_modifiers/source/gameengine/GameLogic/SCA_IInputDevice.h
    branches/vgroup_modifiers/source/gameengine/GameLogic/SConscript
    branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
    branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/vgroup_modifiers/source/gameengine/GamePlayer/common/SConscript
    branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
    branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/SConscript
    branches/vgroup_modifiers/source/gameengine/Ketsji/BL_Action.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/BL_Material.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/BL_Shader.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/BL_Shader.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/BL_Texture.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KXNetwork/SConscript
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_CharacterWrapper.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Dome.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_GameObject.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Scene.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Scene.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/SConscript
    branches/vgroup_modifiers/source/gameengine/Network/LoopBackNetwork/SConscript
    branches/vgroup_modifiers/source/gameengine/Network/SConscript
    branches/vgroup_modifiers/source/gameengine/Physics/Bullet/SConscript
    branches/vgroup_modifiers/source/gameengine/Physics/Dummy/SConscript
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/vgroup_modifiers/source/gameengine/Rasterizer/SConscript
    branches/vgroup_modifiers/source/gameengine/SceneGraph/SConscript
    branches/vgroup_modifiers/source/gameengine/VideoTexture/ImageRender.cpp
    branches/vgroup_modifiers/source/gameengine/VideoTexture/SConscript
    branches/vgroup_modifiers/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/vgroup_modifiers/source/tests/bl_run_operators.py
    branches/vgroup_modifiers/source/tools/spell_check_source.py
    branches/vgroup_modifiers/source/tools/uncrustify_clean.sh
    branches/vgroup_modifiers/source/tools/update_themes.py

Added Paths:
-----------
    branches/vgroup_modifiers/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
    branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
    branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/keyframe_selection.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_jitter.h
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_wavelength.osl
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_wavelength.h
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_properties.py
    branches/vgroup_modifiers/scons/scons-local/
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_autoexec.h
    branches/vgroup_modifiers/source/blender/blenkernel/intern/autoexec.c
    branches/vgroup_modifiers/source/blender/blenlib/BLI_sys_types.h
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_connect_pair.c
    branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_path.c
    branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_path.h
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_path.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_vertex_proj.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_wavelength.c

Removed Paths:
-------------
    branches/vgroup_modifiers/extern/libmv/libmv/tracking/esm_region_tracker.cc
    branches/vgroup_modifiers/extern/libmv/libmv/tracking/esm_region_tracker.h
    branches/vgroup_modifiers/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
    branches/vgroup_modifiers/extern/libmv/libmv/tracking/lmicklt_region_tracker.h
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_SizerWin32.cpp
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_SizerWin32.h
    branches/vgroup_modifiers/intern/guardedalloc/MEM_sys_types.h
    branches/vgroup_modifiers/intern/opennl/superlu/superlu_sys_types.h
    branches/vgroup_modifiers/scons/scons-local-1.2.0.d20090223/
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_script.h
    branches/vgroup_modifiers/source/blender/blenkernel/intern/script.c
    branches/vgroup_modifiers/source/blender/blenloader/BLO_sys_types.h
    branches/vgroup_modifiers/source/blender/editors/space_buttons/buttons_header.c

Property Changed:
----------------
    branches/vgroup_modifiers/
    branches/vgroup_modifiers/extern/carve/include/carve/aabb.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/aabb_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/carve.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/classification.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/collection/unordered/boost_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/collection/unordered/fallback_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/collection/unordered/libstdcpp_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/collection/unordered/std_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/collection/unordered/tr1_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/collection/unordered/vcpp_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/collection/unordered.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/collection.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/collection_types.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/colour.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/convex_hull.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/csg.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/csg_triangulator.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/debug_hooks.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/djset.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/edge_decl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/edge_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/exact.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/external/boost/random.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/face_decl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/face_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/faceloop.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/geom.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/geom2d.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/geom3d.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/geom_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/heap.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/input.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/interpolator.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/intersection.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/iobj.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/kd_node.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/math.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/math_constants.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/matrix.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/mesh.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/mesh_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/mesh_ops.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/mesh_simplify.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/octree_decl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/octree_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/pointset.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/pointset_decl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/pointset_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/pointset_iter.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/poly.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/poly_decl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/poly_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/polyhedron_base.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/polyhedron_decl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/polyhedron_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/polyline.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/polyline_decl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/polyline_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/polyline_iter.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/rescale.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/rtree.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/spacetree.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/tag.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/timing.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/tree.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/triangulator.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/triangulator_impl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/util.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/vector.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/vertex_decl.hpp
    branches/vgroup_modifiers/extern/carve/include/carve/vertex_impl.hpp
    branches/vgroup_modifiers/extern/carve/lib/csg_collector.hpp
    branches/vgroup_modifiers/extern/carve/lib/csg_data.hpp
    branches/vgroup_modifiers/extern/carve/lib/csg_detail.hpp
    branches/vgroup_modifiers/extern/carve/lib/intersect_classify_common.hpp
    branches/vgroup_modifiers/extern/carve/lib/intersect_classify_common_impl.hpp
    branches/vgroup_modifiers/extern/carve/lib/intersect_common.hpp
    branches/vgroup_modifiers/extern/carve/lib/intersect_debug.hpp
    branches/vgroup_modifiers/extern/carve/patches/files/random.hpp
    branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
    branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/reconstruction_scale.h
    branches/vgroup_modifiers/extern/libmv/third_party/ceres/include/ceres/autodiff_local_parameterization.h
    branches/vgroup_modifiers/extern/libmv/third_party/ceres/include/ceres/internal/numeric_diff.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel.cl
    branches/vgroup_modifiers/intern/cycles/kernel/kernel.cu
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_bvh_traversal.h
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_toon_bsdf.osl
    branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_wireframe.osl
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_wireframe.h
    branches/vgroup_modifiers/release/scripts/modules/nodeitems_utils.py
    branches/vgroup_modifiers/release/scripts/startup/nodeitems_builtins.py
    branches/vgroup_modifiers/release/scripts/templates_osl/ramp_closure.osl
    branches/vgroup_modifiers/release/scripts/templates_osl/temperature_to_rgb.osl
    branches/vgroup_modifiers/release/scripts/templates_osl/wavelength_to_rgb.osl
    branches/vgroup_modifiers/release/scripts/templates_osl/westin_closure.osl
    branches/vgroup_modifiers/source/blender/blenlib/BLI_math_color_blend.h
    branches/vgroup_modifiers/source/blender/blenlib/intern/math_color_blend_inline.c
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_OpenCLKernels.cl
    branches/vgroup_modifiers/source/blender/editors/include/ED_buttons.h
    branches/vgroup_modifiers/source/blender/editors/interface/interface.c
    branches/vgroup_modifiers/source/blender/editors/space_outliner/
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_wireframe.c


Property changes on: branches/vgroup_modifiers
___________________________________________________________________
Modified: svn:ignore
   - *.pdb
.*
TAGS
cscope.out
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
CMakeFiles
CMakeCache.txt
blender.bin
blender.kdev4
.kdev4

   + BUILD_NOTES.txt
*.pdb
.*
TAGS
cscope.out
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
CMakeFiles
CMakeCache.txt
blender.bin
blender.kdev4
.kdev4

Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-57000
   + /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,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-58000

Modified: branches/vgroup_modifiers/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/CMakeLists.txt	2013-10-05 09:48:09 UTC (rev 60559)
+++ branches/vgroup_modifiers/CMakeLists.txt	2013-10-05 10:13:32 UTC (rev 60560)
@@ -118,9 +118,10 @@
 option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
 
 option(WITH_PYTHON        "Enable Embedded Python API  (only disable for development)" ON)
-option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
+option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default" ON) 
 mark_as_advanced(WITH_PYTHON)  # dont want people disabling this unless they really know what they are doing.
 mark_as_advanced(WITH_PYTHON_SECURITY)  # some distributions see this as a security issue, rather than have them patch it, make a build option.
+set(WITH_PYTHON_SECURITY ON CACHE BOOL "ON" FORCE) # temp force on. 
 
 option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
 option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
@@ -263,7 +264,7 @@
 option(WITH_CYCLES_TEST				"Build cycles test application" OFF)
 option(WITH_CYCLES_OSL				"Build Cycles with OSL support" OFF)
 option(WITH_CYCLES_CUDA_BINARIES	"Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
 
@@ -561,12 +562,12 @@
 if(UNIX AND NOT APPLE)
 	macro(find_package_wrapper)
 		string(TOUPPER ${ARGV0} _NAME_UPPER)
-		if(${WITH_STATIC_LIBS})
+		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()
 		find_package(${ARGV})
-		if(${WITH_STATIC_LIBS})
+		if(WITH_STATIC_LIBS)
 			set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back})
 			unset(_cmake_find_library_suffixes_back)
 		endif()
@@ -706,7 +707,7 @@
 	if(WITH_BOOST)
 		# uses in build instructions to override include and library variables
 		if(NOT BOOST_CUSTOM)
-			if(${WITH_STATIC_LIBS})
+			if(WITH_STATIC_LIBS)
 				set(Boost_USE_STATIC_LIBS ON)
 			endif()
 			set(Boost_USE_MULTITHREADED ON)
@@ -931,20 +932,26 @@
 	#  include(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
 
 	if(CMAKE_COMPILER_IS_GNUCC)
-		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
 		include(CheckCSourceCompiles)
 		# Setup 64bit and 64bit windows systems
 		CHECK_C_SOURCE_COMPILES("
 			#ifndef __MINGW64__
 			#error
 			#endif
-			main(){}
+			int main(void) { return 0; }
 			" 
 			WITH_MINGW64)
 		
 		if(WITH_MINGW64)
 			message(STATUS "Compiling for 64 bit with MinGW-w64.")
 			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
+		else()
+			message(STATUS "Compiling for 32 bit with MinGW-w32.")
+			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
+			
+			if(WITH_RAYOPTIMIZATION)
+				message(WARNING "MinGW-w32 is known to be unstable with 'WITH_RAYOPTIMIZATION' option enabled.")
+			endif()
 		endif()
 	else()
 		# Setup 64bit and 64bit windows systems
@@ -1088,11 +1095,7 @@
 		set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
 
 		set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
-		if(CMAKE_CL_64)
-			set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz.lib)
-		else()
-			set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/zlib.lib)
-		endif()
+		set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz_st.lib)
 
 		set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)
 		set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC2.lib)
@@ -1121,26 +1124,22 @@
 				${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
 				${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
 			)
-			set_lib_path(OPENCOLLADA_LIBPATH "opencollada")
 
 			set(OPENCOLLADA_LIBRARIES
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAFramework.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADABaseUtils.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAStreamWriter.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/MathMLSolver.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/GeneratedSaxParser.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/xml.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/buffer.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/ftoa.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/UTF.lib
+				${OPENCOLLADA}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
+				${OPENCOLLADA}/lib/opencollada/OpenCOLLADAFramework.lib
+				${OPENCOLLADA}/lib/opencollada/OpenCOLLADABaseUtils.lib
+				${OPENCOLLADA}/lib/opencollada/OpenCOLLADAStreamWriter.lib
+				${OPENCOLLADA}/lib/opencollada/MathMLSolver.lib
+				${OPENCOLLADA}/lib/opencollada/GeneratedSaxParser.lib
+				${OPENCOLLADA}/lib/opencollada/xml.lib
+				${OPENCOLLADA}/lib/opencollada/buffer.lib
+				${OPENCOLLADA}/lib/opencollada/ftoa.lib
+				${OPENCOLLADA}/lib/opencollada/UTF.lib
 			)
 			set(PCRE_LIBRARIES
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/pcre.lib
+				${OPENCOLLADA}/lib/opencollada/pcre.lib
 			)
-			
-			unset(OPENCOLLADA_LIBPATH)
-			
 		endif()
 
 		if(WITH_CODEC_FFMPEG)
@@ -1169,7 +1168,7 @@
 		endif()
 
 		if(WITH_IMAGE_OPENEXR)
-			set_lib_path(OPENEXR "openexr")
+			set(OPENEXR ${LIBDIR}/openexr)
 			set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
 			set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
 			set(OPENEXR_LIBPATH ${OPENEXR}/lib)
@@ -1196,18 +1195,11 @@
 		endif()
 
 		if(WITH_PYTHON)
-			# normally cached but not since we include them with blender
-			if(MSVC10)
-				set(PYTHON_VERSION 3.3) # CACHE STRING)
-			else()
-				set(PYTHON_VERSION 3.3) # CACHE STRING)
-			endif()
+			set(PYTHON_VERSION 3.3) # CACHE STRING)
 
-			set_lib_path(PYTHON "python")
 			string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
 			# Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
 			set(PYTHON_LIBRARY ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib)
-			# set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
 			unset(_PYTHON_VERSION_NO_DOTS)
 
 			# Shared includes for both vc2008 and vc2010
@@ -1225,10 +1217,6 @@
 				set(BOOST_LIBPATH ${BOOST}/lib)
 				set(BOOST_POSTFIX "vc110-mt-s-1_53.lib")
 				set(BOOST_DEBUG_POSTFIX "vc110-mt-sgd-1_53.lib")
-			elseif(MSVC10)
-				set(BOOST_LIBPATH ${BOOST}/vc2010/lib)
-				set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
-				set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
 			else()
 				set(BOOST_LIBPATH ${BOOST}/lib)
 				set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
@@ -2081,13 +2069,6 @@
 
 endif()
 
-# MSVC2010 fails to links C++ libs right
-if(MSVC10)
-	if(WITH_OPENCOLLADA)
-		message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
-	endif()
-endif()
-
 # ensure python header is found since detection can fail, this could happen
 # with _any_ library but since we used a fixed python version this tends to
 # be most problematic.

Modified: branches/vgroup_modifiers/SConstruct
===================================================================
--- branches/vgroup_modifiers/SConstruct	2013-10-05 09:48:09 UTC (rev 60559)
+++ branches/vgroup_modifiers/SConstruct	2013-10-05 10:13:32 UTC (rev 60560)
@@ -46,9 +46,7 @@
 import os.path
 import string
 import shutil
-import glob
 import re
-from tempfile import mkdtemp
 
 # store path to tools
 toolpath=os.path.join(".", "build_files", "scons", "tools")
@@ -58,7 +56,6 @@
 
 import Blender
 import btools
-import bcolors
 
 EnsureSConsVersion(1,0,0)
 
@@ -121,7 +118,7 @@
 
 if bitness:
     B.bitness = bitness
-else: 
+else:
     B.bitness = tempbitness
 
 
@@ -140,6 +137,8 @@
     B.quickie=[]
 
 toolset = B.arguments.get('BF_TOOLSET', None)
+vcver = B.arguments.get('MSVS_VERSION', '9.0')
+
 if toolset:
     print "Using " + toolset
     if toolset=='mstoolkit':
@@ -151,9 +150,9 @@

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list