svn merge ^/trunk/blender -r43420:43436
authorCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jan 2012 02:20:23 +0000 (02:20 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jan 2012 02:20:23 +0000 (02:20 +0000)
commitbbe69705a52386ca5b6552d7187b0492b4b2b378
tree48fb3e4b70c78b2a31f1c6a0a02e33b09b0113f5
parent0e0d88605f0ce7422f278c399b913d394bc7f3ca
parent67b2985cceaf789e1b77d4f70864bf67ee9375c3
svn merge ^/trunk/blender -r43420:43436
15 files changed:
CMakeLists.txt
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_ops.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/modifiers/intern/MOD_boolean.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt
source/creator/creator.c