Merged revision(s) 58093-58225 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Sat, 13 Jul 2013 23:52:43 +0000 (23:52 +0000)
committerThomas Dinges <blender@dingto.org>
Sat, 13 Jul 2013 23:52:43 +0000 (23:52 +0000)
1  2 
intern/cycles/blender/addon/ui.py
source/blender/blenkernel/intern/node.c
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_nodetree.c

Simple merge