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)
commit12a45c8b1b7102526faf3a6b27fa0ec0a4679566
tree4a4d98649384b8462e3eed3d74661d61fe0db067
parent70caadd8376d0d5f623e0cc7c8912b91ee34a0ee
parent33b65832d2002979c27b39a1fbe1d59f77a24565
Merged revision(s) 58093-58225 from trunk/blender into soc-2013-dingto.
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