[Bf-blender-cvs] [e718004edf3] master: Cleanup: use bool arguments & variables
Campbell Barton
noreply at git.blender.org
Sat Jan 9 09:16:38 CET 2021
Commit: e718004edf3fc335d686cc2a0291f1f0df4eba32
Author: Campbell Barton
Date: Sat Jan 9 19:00:05 2021 +1100
Branches: master
https://developer.blender.org/rBe718004edf3fc335d686cc2a0291f1f0df4eba32
Cleanup: use bool arguments & variables
===================================================================
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/intern/mesh_convert.c
M source/blender/editors/armature/pose_slide.c
M source/blender/editors/sculpt_paint/paint_image_2d.c
M source/blender/editors/uvedit/uvedit_ops.c
M source/blender/python/intern/bpy_interface.c
M source/blender/render/RE_engine.h
M source/blender/render/intern/engine.c
M source/blender/render/intern/pipeline.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 2d8dc852d7c..e39caac7c36 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -229,7 +229,7 @@ struct Mesh *BKE_mesh_create_derived_for_modifier(struct Depsgraph *depsgraph,
struct Scene *scene,
struct Object *ob_eval,
struct ModifierData *md_eval,
- int build_shapekey_layers);
+ const bool build_shapekey_layers);
/* Copies a nomain-Mesh into an existing Mesh. */
void BKE_mesh_nomain_to_mesh(struct Mesh *mesh_src,
diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c
index 73883afe19e..385fd473e63 100644
--- a/source/blender/blenkernel/intern/mesh_convert.c
+++ b/source/blender/blenkernel/intern/mesh_convert.c
@@ -1407,7 +1407,7 @@ Mesh *BKE_mesh_create_derived_for_modifier(struct Depsgraph *depsgraph,
Scene *scene,
Object *ob_eval,
ModifierData *md_eval,
- int build_shapekey_layers)
+ const bool build_shapekey_layers)
{
Mesh *me = ob_eval->runtime.data_orig ? ob_eval->runtime.data_orig : ob_eval->data;
const ModifierTypeInfo *mti = BKE_modifier_get_info(md_eval->type);
diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c
index 3781b2e318b..4b646bb26e2 100644
--- a/source/blender/editors/armature/pose_slide.c
+++ b/source/blender/editors/armature/pose_slide.c
@@ -1779,7 +1779,7 @@ static void pose_propagate_fcurve(
float refVal = 0.0f;
bool keyExists;
int i, match;
- short first = 1;
+ bool first = true;
/* skip if no keyframes to edit */
if ((fcu->bezt == NULL) || (fcu->totvert < 2)) {
@@ -1826,7 +1826,7 @@ static void pose_propagate_fcurve(
}
else if (mode == POSE_PROPAGATE_NEXT_KEY) {
/* stop after the first keyframe has been processed */
- if (first == 0) {
+ if (first == false) {
break;
}
}
@@ -1865,7 +1865,7 @@ static void pose_propagate_fcurve(
/* select keyframe to indicate that it's been changed */
bezt->f2 |= SELECT;
- first = 0;
+ first = false;
}
}
diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c
index 78dc5fea2ce..29e2af01cac 100644
--- a/source/blender/editors/sculpt_paint/paint_image_2d.c
+++ b/source/blender/editors/sculpt_paint/paint_image_2d.c
@@ -91,7 +91,7 @@ typedef struct BrushPainter {
Scene *scene;
Brush *brush;
- short firsttouch; /* first paint op */
+ bool firsttouch; /* first paint op */
struct ImagePool *pool; /* image pool */
rctf tex_mapping; /* texture coordinate mapping */
@@ -161,7 +161,7 @@ static BrushPainter *brush_painter_2d_new(Scene *scene, Brush *brush, bool inver
painter->brush = brush;
painter->scene = scene;
- painter->firsttouch = 1;
+ painter->firsttouch = true;
painter->cache_invert = invert;
return painter;
@@ -1659,7 +1659,7 @@ void paint_2d_stroke(void *ps,
}
}
- painter->firsttouch = 0;
+ painter->firsttouch = false;
}
void *paint_2d_new_stroke(bContext *C, wmOperator *op, int mode)
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 167acf7da18..e11341429a6 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -1451,7 +1451,7 @@ static int uv_hide_exec(bContext *C, wmOperator *op)
Scene *scene = CTX_data_scene(C);
const ToolSettings *ts = scene->toolsettings;
const bool swap = RNA_boolean_get(op->ptr, "unselected");
- const int use_face_center = (ts->uv_selectmode == UV_SELECT_FACE);
+ const bool use_face_center = (ts->uv_selectmode == UV_SELECT_FACE);
uint objects_len = 0;
Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(
@@ -1583,8 +1583,8 @@ static int uv_reveal_exec(bContext *C, wmOperator *op)
Scene *scene = CTX_data_scene(C);
const ToolSettings *ts = scene->toolsettings;
- const int use_face_center = (ts->uv_selectmode == UV_SELECT_FACE);
- const int stickymode = sima ? (sima->sticky != SI_STICKY_DISABLE) : 1;
+ const bool use_face_center = (ts->uv_selectmode == UV_SELECT_FACE);
+ const bool stickymode = sima ? (sima->sticky != SI_STICKY_DISABLE) : 1;
const bool select = RNA_boolean_get(op->ptr, "select");
uint objects_len = 0;
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 2bd71c27320..c54c78ae389 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -536,7 +536,7 @@ void BPY_DECREF(void *pyob_ptr)
void BPY_DECREF_RNA_INVALIDATE(void *pyob_ptr)
{
const PyGILState_STATE gilstate = PyGILState_Ensure();
- const int do_invalidate = (Py_REFCNT((PyObject *)pyob_ptr) > 1);
+ const bool do_invalidate = (Py_REFCNT((PyObject *)pyob_ptr) > 1);
Py_DECREF((PyObject *)pyob_ptr);
if (do_invalidate) {
pyrna_invalidate(pyob_ptr);
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)) {
More information about the Bf-blender-cvs
mailing list