diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2018-01-25 16:31:54 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2018-01-25 16:31:54 +0300 |
commit | 748adb37e5a0c4de136fae64e9b1aa41defee3cf (patch) | |
tree | 7748703338475df01bd4bf08e59acbaaf4e1ea89 /source/blender/render | |
parent | e057d7b9eb3f7641008e2cd77be9691d84433e5d (diff) | |
parent | da4c3f30d984b361d7c00b103ec329d5263779ff (diff) |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/render_result.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 261d9e2e159..5a5c99724fe 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -449,8 +449,6 @@ void RE_AcquireResultImage(Render *re, RenderResult *rr, const int view_id) rr->rectz = rv->rectz; rr->rect32 = rv->rect32; - rr->have_combined = (rv->rectf != NULL); - /* active layer */ rl = render_get_active_layer(re, re->result); @@ -861,7 +859,7 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, re->result = MEM_callocN(sizeof(RenderResult), "new render result"); re->result->rectx = re->rectx; re->result->recty = re->recty; - render_result_view_new(re->result, "new temporary view"); + render_result_view_new(re->result, ""); } if (re->r.scemode & R_VIEWPORT_PREVIEW) diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 10920545b88..6749fedb16e 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -80,6 +80,8 @@ static void render_result_views_free(RenderResult *res) MEM_freeN(rv); } + + res->have_combined = false; } void render_result_free(RenderResult *res) @@ -1352,6 +1354,8 @@ void RE_render_result_rect_from_ibuf(RenderResult *rr, RenderData *UNUSED(rd), I RenderView *rv = RE_RenderViewGetById(rr, view_id); if (ibuf->rect_float) { + rr->have_combined = true; + if (!rv->rectf) rv->rectf = MEM_mallocN(4 * sizeof(float) * rr->rectx * rr->recty, "render_seq rectf"); @@ -1362,6 +1366,8 @@ void RE_render_result_rect_from_ibuf(RenderResult *rr, RenderData *UNUSED(rd), I MEM_SAFE_FREE(rv->rect32); } else if (ibuf->rect) { + rr->have_combined = true; + if (!rv->rect32) rv->rect32 = MEM_mallocN(sizeof(int) * rr->rectx * rr->recty, "render_seq rect"); |