Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-12-20 16:25:18 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-12-20 16:25:18 +0400
commit81c635a3bb194931384d9533e02bff7fc09307b0 (patch)
treec1b69bb6b7a19beb95db3431e3c5643f628df9da /source
parentea88a0bec5317fbd84dd2f9128dbae8a50d3863e (diff)
Fix #25775: crash using border render from external render engines, merging
back the tile used wrong offsets.
Diffstat (limited to 'source')
-rw-r--r--source/blender/render/intern/source/external_engine.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 2b44bad82ab..dc2de5fb450 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -190,6 +190,11 @@ void RE_engine_end_result(RenderEngine *engine, RenderResult *result)
if(!result)
return;
+
+ result->tilerect.xmin += re->disprect.xmin;
+ result->tilerect.xmax += re->disprect.xmin;
+ result->tilerect.ymin += re->disprect.ymin;
+ result->tilerect.ymax += re->disprect.ymin;
/* merge. on break, don't merge in result for preview renders, looks nicer */
if(!(re->test_break(re->tbh) && (re->r.scemode & R_PREVIEWBUTS)))