From 7cb55a79d82d3e2e9d330368492210b17f6e1eac Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 26 Feb 2021 16:50:36 +1100 Subject: Cleanup: use boolean arguments --- source/blender/render/RE_pipeline.h | 2 +- source/blender/render/intern/engine.c | 10 +++++----- source/blender/render/intern/pipeline.c | 2 +- source/blender/render/intern/render_types.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/render') diff --git a/source/blender/render/RE_pipeline.h b/source/blender/render/RE_pipeline.h index 688709d55f3..27dcd9e70ed 100644 --- a/source/blender/render/RE_pipeline.h +++ b/source/blender/render/RE_pipeline.h @@ -331,7 +331,7 @@ void RE_display_update_cb(struct Render *re, void (*f)(void *handle, RenderResult *rr, volatile struct rcti *rect)); void RE_stats_draw_cb(struct Render *re, void *handle, void (*f)(void *handle, RenderStats *rs)); void RE_progress_cb(struct Render *re, void *handle, void (*f)(void *handle, float)); -void RE_draw_lock_cb(struct Render *re, void *handle, void (*f)(void *handle, int)); +void RE_draw_lock_cb(struct Render *re, void *handle, void (*f)(void *handle, bool lock)); void RE_test_break_cb(struct Render *re, void *handle, int (*f)(void *handle)); void RE_current_scene_update_cb(struct Render *re, void *handle, diff --git a/source/blender/render/intern/engine.c b/source/blender/render/intern/engine.c index b199b1b0743..a43a78f5d3d 100644 --- a/source/blender/render/intern/engine.c +++ b/source/blender/render/intern/engine.c @@ -757,7 +757,7 @@ static void engine_render_view_layer(Render *re, { /* Lock UI so scene can't be edited while we read from it in this render thread. */ if (re->draw_lock) { - re->draw_lock(re->dlh, 1); + re->draw_lock(re->dlh, true); } /* Create depsgraph with scene evaluated at render resolution. */ @@ -773,7 +773,7 @@ static void engine_render_view_layer(Render *re, } if (re->draw_lock) { - re->draw_lock(re->dlh, 0); + re->draw_lock(re->dlh, false); } /* Perform render with engine. */ @@ -824,7 +824,7 @@ bool RE_engine_render(Render *re, bool do_all) /* Lock drawing in UI during data phase. */ if (re->draw_lock) { - re->draw_lock(re->dlh, 1); + re->draw_lock(re->dlh, true); } /* update animation here so any render layer animation is applied before @@ -852,7 +852,7 @@ bool RE_engine_render(Render *re, bool do_all) if (re->result == NULL) { /* Clear UI drawing locks. */ if (re->draw_lock) { - re->draw_lock(re->dlh, 0); + re->draw_lock(re->dlh, false); } /* Too small image is handled earlier, here it could only happen if * there was no sufficient memory to allocate all passes. @@ -902,7 +902,7 @@ bool RE_engine_render(Render *re, bool do_all) /* Clear UI drawing locks. */ if (re->draw_lock) { - re->draw_lock(re->dlh, 0); + re->draw_lock(re->dlh, false); } /* Render view layers. */ diff --git a/source/blender/render/intern/pipeline.c b/source/blender/render/intern/pipeline.c index 0a8b8f24614..92bec9c6fd4 100644 --- a/source/blender/render/intern/pipeline.c +++ b/source/blender/render/intern/pipeline.c @@ -1017,7 +1017,7 @@ void RE_progress_cb(Render *re, void *handle, void (*f)(void *handle, float)) re->prh = handle; } -void RE_draw_lock_cb(Render *re, void *handle, void (*f)(void *handle, int i)) +void RE_draw_lock_cb(Render *re, void *handle, void (*f)(void *handle, bool lock)) { re->draw_lock = f; re->dlh = handle; diff --git a/source/blender/render/intern/render_types.h b/source/blender/render/intern/render_types.h index 7a4374dcf7c..0488bf6e87a 100644 --- a/source/blender/render/intern/render_types.h +++ b/source/blender/render/intern/render_types.h @@ -141,7 +141,7 @@ struct Render { void (*progress)(void *handle, float i); void *prh; - void (*draw_lock)(void *handle, int i); + void (*draw_lock)(void *handle, bool lock); void *dlh; int (*test_break)(void *handle); void *tbh; -- cgit v1.2.3