svn merge ^/trunk/blender -r47325:47381
authorCampbell Barton <ideasman42@gmail.com>
Sun, 3 Jun 2012 18:25:57 +0000 (18:25 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 3 Jun 2012 18:25:57 +0000 (18:25 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_scene.c
source/blender/nodes/composite/node_composite_util.h
source/blender/nodes/composite/nodes/node_composite_blur.c
source/blender/nodes/composite/nodes/node_composite_dilate.c