svn merge ^/trunk/blender -r49520:49531
authorCampbell Barton <ideasman42@gmail.com>
Fri, 3 Aug 2012 13:29:33 +0000 (13:29 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 3 Aug 2012 13:29:33 +0000 (13:29 +0000)
1  2 
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_draw.c