diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-25 21:51:36 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-25 21:54:48 +0300 |
commit | 7e40a231a7c55a6745511221a74137317bd0aaec (patch) | |
tree | 817c4321d92e2371d7d412bddc1c93ba66646e2b /source/blender/render | |
parent | 9ad379fe559200e7a17a3c9571ff0785a095dfac (diff) |
Fix T61946: Cycles border render missing samples and crypto metadata.
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 1 | ||||
-rw-r--r-- | source/blender/render/intern/source/render_result.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index bb8e70a20cc..1b425540145 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1890,6 +1890,7 @@ static void render_result_uncrop(Render *re) render_result_disprect_to_full_resolution(re); rres = render_result_new(re, &re->disprect, 0, RR_USE_MEM, RR_ALL_LAYERS, RR_ALL_VIEWS); + rres->stamp_data = BKE_stamp_data_copy(re->result->stamp_data); render_result_clone_passes(re, rres, NULL); diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index adce14b646e..822c996c504 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -1557,6 +1557,6 @@ RenderResult *RE_DuplicateRenderResult(RenderResult *rr) if (new_rr->rectz != NULL) { new_rr->rectz = MEM_dupallocN(new_rr->rectz); } - new_rr->stamp_data = MEM_dupallocN(new_rr->stamp_data); + new_rr->stamp_data = BKE_stamp_data_copy(new_rr->stamp_data); return new_rr; } |