svn merge ^/trunk/blender -r47058:47067
authorCampbell Barton <ideasman42@gmail.com>
Sun, 27 May 2012 11:12:29 +0000 (11:12 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 27 May 2012 11:12:29 +0000 (11:12 +0000)
commitd80333c2adbe1f848dc71d71fc6964f3459b5543
tree4910e2f7f1011bad6a388a976bd0d8bb211b5860
parente7ba0100c7d9254e2220ef6ca484883db40910bd
parent405f6a7c77c597f218796c36cd09fd0250c534e1
svn merge ^/trunk/blender -r47058:47067
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/rna_nodetree.c