diff options
author | Ton Roosendaal <ton@blender.org> | 2009-02-05 22:28:28 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2009-02-05 22:28:28 +0300 |
commit | e1b92bc166ac27e29dfdbec315a7b6233d8724d2 (patch) | |
tree | 2ed3ef7d6d3ac107ff4bd578ae0f2544570087b2 /source/blender/blenloader | |
parent | 0a3697ccf7f16bd328a8894c62995de0ff12adb0 (diff) |
2.5
Safe method to move render results to the displayed image.
It now allocates a single image for display, and on each
refresh callback from render, it copies the refreshed
section over to this image, in 32 bits. While rendering
that image then only shows progress updates, as usual.
This also now works for scenes in composte and results
for composite.
This should solve reported crashes for MBlur or SSS.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 40561a1a63a..de920ff9f25 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3678,7 +3678,7 @@ static void composite_patch(bNodeTree *ntree, Scene *scene) bNode *node; for(node= ntree->nodes.first; node; node= node->next) - if(node->id==NULL && node->type==CMP_NODE_R_LAYERS) + if(node->id==NULL && ELEM(node->type, CMP_NODE_R_LAYERS, CMP_NODE_COMPOSITE)) node->id= &scene->id; } |