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)
commit4413024cdcf68c911c7de0ee3eea3221bef48b90
tree4a1582557f85da8dda0029b12e6bf85c937fda34
parentfea490c73e361409f4d52c787d9ceed9655adb13
parentf9856c1c2da8139651eb59ff3bf174065d0f628c
svn merge ^/trunk/blender -r47325:47381
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