Cycles: svn merge -r40934:41157 ^/trunk/blender
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 21 Oct 2011 20:13:12 +0000 (20:13 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 21 Oct 2011 20:13:12 +0000 (20:13 +0000)
commit10af15b85b743a18215a1fc58799264b5c798403
tree5c93a43229f31a9befdd2582d3fe382390add2cf
parent3c9d69744e0aca3ffe3ace103233679988769e91
parentaba149189b7f0ee08765d2ef63a94080d02bdbf4
Cycles: svn merge -r40934:41157 ^/trunk/blender
40 files changed:
CMakeLists.txt
release/datafiles/splash.png
release/scripts/startup/bl_ui/properties_particle.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/node.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/datafiles/splash.png.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_node.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_edit.c
source/blender/editors/render/render_preview.c
source/blender/editors/render/render_shading.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_texture.c
source/blender/makesrna/intern/rna_world.c
source/blender/nodes/intern/node_common.c
source/blender/nodes/intern/node_socket.c
source/blender/nodes/shader/node_shader_tree.c
source/blender/python/intern/bpy_interface.c
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_event_system.c
source/creator/CMakeLists.txt
source/creator/creator.c