archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup: if();

Browse Source
This commit is contained in:
Campbell Barton
2012-10-07 09:48:59 +00:00
parent 7748133bf2
commit e8872a8ea2
47 changed files with 495 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/render/intern/source/pipeline.c
View File

@@ -505,7 +505,9 @@ 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) ;
if (re->result && re->result->rectx == re->rectx && re->result->recty == re->recty) {
/* pass */
}
else {
render_result_free(re->result);
re->result = NULL;
@@ -654,8 +656,12 @@ 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)) ;
else render_result_merge(R.result, pa->result);
if (R.test_break(R.tbh) && (R.r.scemode & R_PREVIEWBUTS)) {
/* pass */
}
else {
render_result_merge(R.result, pa->result);
}
}
}