svn merge ^/trunk/blender -r48147:48153
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 08:07:49 +0000 (08:07 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 08:07:49 +0000 (08:07 +0000)
commit78b2f5df4743b52319e211e77d6ce1b0cd049afa
tree9a66bf9200c1e0f0d66cc82d163d3f6e82f99c6f
parentb7640d614a0aa42189de58178174d0638cef9b0f
parent3ba31f048179af054252274b17958d94315c88cf
svn merge ^/trunk/blender -r48147:48153
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c