Cycles: svn merge -r41182:41205 ^/trunk/blender
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Sat, 22 Oct 2011 19:06:41 +0000 (19:06 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Sat, 22 Oct 2011 19:06:41 +0000 (19:06 +0000)
commit2bfd10131e7bcd5926c65c381a3e987145b02ad9
treeb88f9d4cc842a78db4f555d23c1412a950569661
parent83a44e48e7cb5cc6c794b50bb168a21144baeb06
parent726fa618172733f3c4dc5ee85642829400e68f7b
Cycles: svn merge -r41182:41205 ^/trunk/blender
15 files changed:
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_panel.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_node/node_edit.c
source/blender/imbuf/intern/readimage.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy_interface.c
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_event_system.c