svn merge ^/trunk/blender -r48658:48674
authorCampbell Barton <ideasman42@gmail.com>
Fri, 6 Jul 2012 09:24:47 +0000 (09:24 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 6 Jul 2012 09:24:47 +0000 (09:24 +0000)
commitcf369c5e1345fce3d810363fc16235edd7f315a8
treed3d40b5da3e6ea2afbbb747423fad9fb16da9f37
parentf5fe447e0094385e0b41c83666c210d13b7720b3
parent3b559c8cc86fab02609556d2bbdd92aa3d1c3cba
svn merge ^/trunk/blender -r48658:48674
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c