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)
commit19740e92332bac5ee5af115285e846a4e1ca3969
treef87c37dca0f6ad2fca03329516d8d78cc23a346f
parente135bfe41bebfdd7f9518c8700758dbc54de3c1b
parent07da83a3b365f0c88a1798eaef3b53dc4af974ee
svn merge ^/trunk/blender -r49520:49531
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_draw.c