diff options
Diffstat (limited to 'source/blender/render/intern/source/pipeline.c')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 1859de0039d..d7d901fc97f 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -505,9 +505,7 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, SceneRenderLayer * BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE); if (re->r.scemode & R_PREVIEWBUTS) { - if (re->result && re->result->rectx == re->rectx && re->result->recty == re->recty) { - /* pass */ - } + if (re->result && re->result->rectx == re->rectx && re->result->recty == re->recty) ; else { render_result_free(re->result); re->result = NULL; @@ -656,12 +654,8 @@ static void *do_part_thread(void *pa_v) } else if (render_display_draw_enabled(&R)) { /* on break, don't merge in result for preview renders, looks nicer */ - if (R.test_break(R.tbh) && (R.r.scemode & R_PREVIEWBUTS)) { - /* pass */ - } - else { - render_result_merge(R.result, pa->result); - } + if (R.test_break(R.tbh) && (R.r.scemode & R_PREVIEWBUTS)) ; + else render_result_merge(R.result, pa->result); } } |