Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-01-09 11:00:05 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-01-09 11:07:14 +0300
commite718004edf3fc335d686cc2a0291f1f0df4eba32 (patch)
tree97416aa6724970fc430ece20940bd855fdcce6ed /source/blender/render
parent246efd7286f6187e4dd4b3edcc79cccb1746bb1d (diff)
Cleanup: use bool arguments & variables
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/RE_engine.h2
-rw-r--r--source/blender/render/intern/engine.c14
-rw-r--r--source/blender/render/intern/pipeline.c4
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/render/RE_engine.h b/source/blender/render/RE_engine.h
index a153c622af8..1af40ac760b 100644
--- a/source/blender/render/RE_engine.h
+++ b/source/blender/render/RE_engine.h
@@ -204,7 +204,7 @@ void RE_engine_update_memory_stats(RenderEngine *engine, float mem_used, float m
void RE_engine_report(RenderEngine *engine, int type, const char *msg);
void RE_engine_set_error_message(RenderEngine *engine, const char *msg);
-int RE_engine_render(struct Render *re, int do_all);
+bool RE_engine_render(struct Render *re, bool do_all);
bool RE_engine_is_external(const struct Render *re);
diff --git a/source/blender/render/intern/engine.c b/source/blender/render/intern/engine.c
index 13faddfcd2f..151d994dddf 100644
--- a/source/blender/render/intern/engine.c
+++ b/source/blender/render/intern/engine.c
@@ -803,23 +803,23 @@ static void engine_render_view_layer(Render *re,
engine_depsgraph_free(engine);
}
-int RE_engine_render(Render *re, int do_all)
+bool RE_engine_render(Render *re, bool do_all)
{
RenderEngineType *type = RE_engines_find(re->r.engine);
bool persistent_data = (re->r.mode & R_PERSISTENT_DATA) != 0;
/* verify if we can render */
if (!type->render) {
- return 0;
+ return false;
}
if ((re->r.scemode & R_BUTS_PREVIEW) && !(type->flag & RE_USE_PREVIEW)) {
- return 0;
+ return false;
}
if (do_all && !(type->flag & RE_USE_POSTPROCESS)) {
- return 0;
+ return false;
}
if (!do_all && (type->flag & RE_USE_POSTPROCESS)) {
- return 0;
+ return false;
}
/* Lock drawing in UI during data phase. */
@@ -859,7 +859,7 @@ int RE_engine_render(Render *re, int do_all)
*/
BKE_report(re->reports, RPT_ERROR, "Failed allocate render result, out of memory");
G.is_break = true;
- return 1;
+ return true;
}
/* set render info */
@@ -977,7 +977,7 @@ int RE_engine_render(Render *re, int do_all)
}
#endif
- return 1;
+ return true;
}
void RE_engine_update_render_passes(struct RenderEngine *engine,
diff --git a/source/blender/render/intern/pipeline.c b/source/blender/render/intern/pipeline.c
index f484977d2b4..4628a5a132b 100644
--- a/source/blender/render/intern/pipeline.c
+++ b/source/blender/render/intern/pipeline.c
@@ -1130,7 +1130,7 @@ void RE_AddObject(Render *UNUSED(re), Object *UNUSED(ob))
static void do_render_3d(Render *re)
{
re->current_scene_update(re->suh, re->scene);
- RE_engine_render(re, 0);
+ RE_engine_render(re, false);
}
/* make sure disprect is not affected by the render border */
@@ -1599,7 +1599,7 @@ static void do_render_all_options(Render *re)
BKE_image_all_free_anim_ibufs(re->main, re->r.cfra);
SEQ_relations_free_all_anim_ibufs(re->scene, re->r.cfra);
- if (RE_engine_render(re, 1)) {
+ if (RE_engine_render(re, true)) {
/* in this case external render overrides all */
}
else if (RE_seq_render_active(re->scene, &re->r)) {