svn merge ^/trunk/blender -r49061:49063
authorCampbell Barton <ideasman42@gmail.com>
Thu, 19 Jul 2012 11:35:45 +0000 (11:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 19 Jul 2012 11:35:45 +0000 (11:35 +0000)
1  2 
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c