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)
commit3c194601f47f11f0d8f0c582f01901a089996619
treeafd788833650588dd493bd513e0c2d628f8c84dc
parentefe289f3121f1eb9a7d85520cf5bfaeed88bcf50
parentceea98be2f54ed72691a130ea8eed613726e4521
svn merge ^/trunk/blender -r47253:47272
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c