diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-01-02 20:20:18 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-01-02 20:20:18 +0400 |
| commit | 1fc26516eaec2afa976af080e3072abda6e8065f (patch) | |
| tree | 7fd6ce7849091a049241dfce36b47def4a621c72 /source/blender/render/intern | |
| parent | 77bdef4d2251a378c178ab571f3ffd3add39ae91 (diff) | |
Fix #29746: cycles crash with border render.
Diffstat (limited to 'source/blender/render/intern')
| -rw-r--r-- | source/blender/render/intern/source/external_engine.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index dc2de5fb450..78215498a47 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -170,6 +170,11 @@ RenderResult *RE_engine_begin_result(RenderEngine *engine, int x, int y, int w, result= new_render_result(re, &disprect, 0, RR_USEMEM); BLI_addtail(&engine->fullresult, result); + + result->tilerect.xmin += re->disprect.xmin; + result->tilerect.xmax += re->disprect.xmin; + result->tilerect.ymin += re->disprect.ymin; + result->tilerect.ymax += re->disprect.ymin; return result; } @@ -190,11 +195,6 @@ 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))) |