svn merge ^/trunk/blender -r40644:40720
authorCampbell Barton <ideasman42@gmail.com>
Thu, 6 Oct 2011 16:59:58 +0000 (16:59 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 6 Oct 2011 16:59:58 +0000 (16:59 +0000)
commit8695bedda2cb57490bcea957b0a25eb85cb4c9a5
tree4355e0c4f0e9492c53c7a9abf424748141ec320c
parent757f177d9d294451441c95f03dcf8327f59a4b98
parent2bb59bc2734ac682208419e42aebf27285a88d22
svn merge ^/trunk/blender -r40644:40720
16 files changed:
CMakeLists.txt
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/multires.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/windowmanager/intern/wm_init_exit.c