svn merge ^/trunk/blender -r48160:48162
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 12:46:33 +0000 (12:46 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 12:46:33 +0000 (12:46 +0000)
1  2 
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c