svn merge ^/trunk/blender -r41150:41175
authorCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 05:00:53 +0000 (05:00 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 05:00:53 +0000 (05:00 +0000)
commit77a7ec7c61965efa9e2e82894c821fe5c937b989
tree5761c94b242930c1e30d895b72dd3b228a4faff8
parent0503a4f7a6fa2aba573ff4f8d4c6d7f387894952
parenta35261cfee1e04bca3366e6967e046cdb00d3d44
svn merge ^/trunk/blender -r41150:41175
13 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_orientations.c
source/creator/CMakeLists.txt
source/creator/creator.c