diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-25 21:55:49 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-25 21:55:49 +0300 |
commit | 98c90df56c1b53109e0fe490fd97bb5031766be6 (patch) | |
tree | 7ea939e368cae8ee44e7d4af53606fc5ba1016bd /source/blender/render/intern | |
parent | 753e73009f7886d61aa80ae0ec56e87dd203bfe7 (diff) | |
parent | 7e40a231a7c55a6745511221a74137317bd0aaec (diff) |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/render/intern')
-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 59697e7ea30..b41c4973e8b 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1111,6 +1111,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 bd4a31d3bc3..4809c643522 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -1507,6 +1507,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; } |