forked from bartvdbraak/blender
Cleanup: use bool arguments & variables
This commit is contained in:
parent
246efd7286
commit
e718004edf
@ -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,
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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,
|
||||
|
@ -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)) {
|
||||
|
Loading…
Reference in New Issue
Block a user