svn merge ^/trunk/blender -r43009:43033
authorCampbell Barton <ideasman42@gmail.com>
Sat, 31 Dec 2011 12:03:36 +0000 (12:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 31 Dec 2011 12:03:36 +0000 (12:03 +0000)
commit78a4e2461419f026d53e409cb75073ba5f47e1bb
tree2847f536bee9b51a0d30f59baf6becc22a8acffd
parent81f5c9ed9b8193864f1c6160aed9eef9338f0d27
parentbac6757ea0b1c873b8dd8221592ea95eed8d5bac
svn merge ^/trunk/blender -r43009:43033
13 files changed:
CMakeLists.txt
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/SConscript
source/blender/modifiers/intern/MOD_util.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt