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/nodes/intern/CMP_nodes/CMP_composite.c | |
| 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/nodes/intern/CMP_nodes/CMP_composite.c')
| -rw-r--r-- | source/blender/nodes/intern/CMP_nodes/CMP_composite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_composite.c b/source/blender/nodes/intern/CMP_nodes/CMP_composite.c index 8e47e17d868..ee9545c3196 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_composite.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_composite.c @@ -50,7 +50,7 @@ static void node_composit_exec_composite(void *data, bNode *node, bNodeStack **i RenderData *rd= data; if(scene && (rd->scemode & R_DOCOMP)) { - RenderResult *rr= RE_GetResult(RE_GetRender(scene->id.name)); /* G.scene is WEAK! */ + RenderResult *rr= RE_GetResult(RE_GetRender(scene->id.name)); if(rr) { CompBuf *outbuf, *zbuf=NULL; |