svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Sun, 24 Jul 2011 13:03:48 +0000 (13:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 24 Jul 2011 13:03:48 +0000 (13:03 +0000)
commit97d0846d2c4eb1610ca90120a8152b9dc54c5c57
treebd1dd9b9c91ecb2da95cb8eb8a76161c7d0e878d
parent1852cf26928ebcc6ead18f8241f99d138b666538
parentb09bb948ee5d59f80a4951ffd99733dd64f12a4a
svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
19 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/multires.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_bake.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform_generics.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt
source/creator/creator.c