Cycles: svn merge -r41157:41182 ^/trunk/blender
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 21 Oct 2011 20:26:54 +0000 (20:26 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 21 Oct 2011 20:26:54 +0000 (20:26 +0000)
commit9adfa289e800a52a7c4a47ea3ee8dcdf5b50f9c2
tree5afda3e9a0463fd4fb7f502281bb41a36ff1d1a7
parent10af15b85b743a18215a1fc58799264b5c798403
parent932aa116df985d21114dcad8c2518f69f8a6a39e
Cycles: svn merge -r41157:41182 ^/trunk/blender
16 files changed:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_panel.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/screen/area.c
source/blender/editors/space_node/node_header.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/makesrna/intern/makesrna.c
source/blender/python/intern/bpy_interface.c
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_event_system.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c