diff options
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_add.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_bake.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_constraint.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_modifier.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_shapekey.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_transform.c | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 924e88babf1..025a7358d97 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2092,7 +2092,7 @@ static int duplicate_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - int linked = RNA_boolean_get(op->ptr, "linked"); + const bool linked = RNA_boolean_get(op->ptr, "linked"); int dupflag = (linked) ? 0 : U.dupflag; BKE_main_id_clear_newpoins(bmain); @@ -2161,7 +2161,7 @@ static int add_named_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); Base *basen, *base; Object *ob; - int linked = RNA_boolean_get(op->ptr, "linked"); + const bool linked = RNA_boolean_get(op->ptr, "linked"); int dupflag = (linked) ? 0 : U.dupflag; char name[MAX_ID_NAME - 2]; diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index b8a96bba874..0a4bbf10bf0 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -770,7 +770,7 @@ static int objects_bake_render_modal(bContext *C, wmOperator *UNUSED(op), const return OPERATOR_PASS_THROUGH; } -static int is_multires_bake(Scene *scene) +static bool is_multires_bake(Scene *scene) { if (ELEM4(scene->r.bake_mode, RE_BAKE_NORMALS, RE_BAKE_DISPLACEMENT, RE_BAKE_DERIVATIVE, RE_BAKE_AO)) return scene->r.bake_flag & R_BAKE_MULTIRES; diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 244bd5c1d71..3d055e7485f 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -1613,7 +1613,7 @@ static short get_new_constraint_target(bContext *C, int con_type, Object **tar_o } /* used by add constraint operators to add the constraint required */ -static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase *list, int type, short setTarget) +static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase *list, int type, const bool setTarget) { Main *bmain = CTX_data_main(C); bPoseChannel *pchan; @@ -1907,7 +1907,7 @@ static int pose_ik_add_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED static int pose_ik_add_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_active_object(C); - int with_targets = RNA_boolean_get(op->ptr, "with_targets"); + const bool with_targets = RNA_boolean_get(op->ptr, "with_targets"); /* add the constraint - all necessary checks should have been done by the invoke() callback already... */ return constraint_add_exec(C, op, ob, get_active_constraints(ob), CONSTRAINT_TYPE_KINEMATIC, with_targets); diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index bccbb5a23b3..c76b866bf2d 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1610,7 +1610,7 @@ static int object_mode_set_exec(bContext *C, wmOperator *op) Object *ob = CTX_data_active_object(C); ObjectMode mode = RNA_enum_get(op->ptr, "mode"); ObjectMode restore_mode = (ob) ? ob->mode : OB_MODE_OBJECT; - int toggle = RNA_boolean_get(op->ptr, "toggle"); + const bool toggle = RNA_boolean_get(op->ptr, "toggle"); if (!ob || !object_mode_compat_test(ob, mode)) return OPERATOR_PASS_THROUGH; diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 50d708bb49e..cd99fd34aac 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -1289,7 +1289,7 @@ static int multires_external_save_exec(bContext *C, wmOperator *op) Object *ob = ED_object_active_context(C); Mesh *me = (ob) ? ob->data : op->customdata; char path[FILE_MAX]; - int relative = RNA_boolean_get(op->ptr, "relative_path"); + const bool relative = RNA_boolean_get(op->ptr, "relative_path"); if (!me) return OPERATOR_CANCELLED; @@ -2097,7 +2097,7 @@ static int ocean_bake_exec(bContext *C, wmOperator *op) OceanCache *och; struct Ocean *ocean; int f, cfra, i = 0; - int free = RNA_boolean_get(op->ptr, "free"); + const bool free = RNA_boolean_get(op->ptr, "free"); wmJob *wm_job; OceanBakeJob *oj; diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index 57cd464b7ad..3df4f721f7a 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -75,7 +75,7 @@ /*********************** add shape key ***********************/ -static void ED_object_shape_key_add(bContext *C, Scene *scene, Object *ob, int from_mix) +static void ED_object_shape_key_add(bContext *C, Scene *scene, Object *ob, const bool from_mix) { KeyBlock *kb; if ((kb = BKE_object_insert_shape_key(scene, ob, NULL, from_mix))) { @@ -312,7 +312,7 @@ static int shape_key_add_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); Object *ob = ED_object_context(C); - int from_mix = RNA_boolean_get(op->ptr, "from_mix"); + const bool from_mix = RNA_boolean_get(op->ptr, "from_mix"); ED_object_shape_key_add(C, scene, ob, from_mix); diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index d40d239319c..dbb4837b009 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -794,7 +794,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op) Object *ob = ctx_ob->ptr.data; if ((ob->flag & OB_DONE) == 0) { - int do_inverse_offset = FALSE; + bool do_inverse_offset = false; ob->flag |= OB_DONE; if (centermode == ORIGIN_TO_CURSOR) { |