svn merge ^/trunk/blender -r48078:48105
authorCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2012 07:43:49 +0000 (07:43 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2012 07:43:49 +0000 (07:43 +0000)
1  2 
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_space.c