Cycles: svn merge -r41627:41650 ^/trunk/blender
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 8 Nov 2011 12:33:17 +0000 (12:33 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 8 Nov 2011 12:33:17 +0000 (12:33 +0000)
commit64ab4140268498384525e05596ea1f559b7cd3df
treec27a3774eb433e0cccd5d3284e6b79f96e32306d
parentdca15b215d994c7bafe9398493a9db1b4df00246
parentdb75cc4cdebb536774a8f2d7601319e2c898ecb0
Cycles: svn merge -r41627:41650 ^/trunk/blender
16 files changed:
intern/cycles/blender/blender_shader.cpp
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/node.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_node/CMakeLists.txt
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_templates.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/nodes/shader/node_shader_util.c
source/blenderplayer/bad_level_call_stubs/stubs.c