svn merge ^/trunk/blender -r47253:47272
authorCampbell Barton <ideasman42@gmail.com>
Thu, 31 May 2012 11:58:14 +0000 (11:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 31 May 2012 11:58:14 +0000 (11:58 +0000)
1  2 
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c