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)
commit858ad8d725d787e27642c5b8f718ea117cf88a82
tree0a69f7e9f4128665ddaaf9690bf0f6d0bbaadc5e
parent1462c2f73e86f628f1168ca412436aaf2069d743
parentfc1164c2236654a74789cf767e8efc73d5599ab1
svn merge ^/trunk/blender -r48078:48105
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_space.c