5 files changed, 13 insertions, 13 deletions

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index e3041d97019..da989ba4f21 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1259,8 +1259,8 @@ static void copy_object_set_idnew(bContext *C, int dupflag)
 /********************* Make Duplicates Real ************************/
 
 static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
-                                       const short use_base_parent,
-                                       const short use_hierarchy)
+                                       const bool use_base_parent,
+                                       const bool use_hierarchy)
 {
 	Main *bmain = CTX_data_main(C);
 	ListBase *lb;
@@ -1410,8 +1410,8 @@ static int object_duplicates_make_real_exec(bContext *C, wmOperator *op)
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 
-	const short use_base_parent = RNA_boolean_get(op->ptr, "use_base_parent");
-	const short use_hierarchy = RNA_boolean_get(op->ptr, "use_hierarchy");
+	const bool use_base_parent = RNA_boolean_get(op->ptr, "use_base_parent");
+	const bool use_hierarchy = RNA_boolean_get(op->ptr, "use_hierarchy");
 
 	BKE_main_id_clear_newpoins(bmain);
 
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 7ae54a1a803..5b0bfef6330 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -178,7 +178,7 @@ static int object_hide_view_set_exec(bContext *C, wmOperator *op)
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	bool changed = false;
-	const int unselected = RNA_boolean_get(op->ptr, "unselected");
+	const bool unselected = RNA_boolean_get(op->ptr, "unselected");
 	
 	CTX_DATA_BEGIN(C, Base *, base, visible_bases)
 	{
@@ -273,7 +273,7 @@ void OBJECT_OT_hide_render_clear(wmOperatorType *ot)
 
 static int object_hide_render_set_exec(bContext *C, wmOperator *op)
 {
-	const int unselected = RNA_boolean_get(op->ptr, "unselected");
+	const bool unselected = RNA_boolean_get(op->ptr, "unselected");
 
 	CTX_DATA_BEGIN(C, Base *, base, visible_bases)
 	{
@@ -432,7 +432,7 @@ void ED_object_editmode_enter(bContext *C, int flag)
 	Object *ob;
 	ScrArea *sa = CTX_wm_area(C);
 	View3D *v3d = NULL;
-	int ok = 0;
+	bool ok = false;
 
 	if (scene->id.lib) return;
 
diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c
index 72d7ffaf2ea..bfaf7f13e61 100644
--- a/source/blender/editors/object/object_group.c
+++ b/source/blender/editors/object/object_group.c
@@ -249,7 +249,7 @@ static int objects_remove_active_exec(bContext *C, wmOperator *op)
 	int single_group_index = RNA_enum_get(op->ptr, "group");
 	Group *single_group = group_object_active_find_index(ob, single_group_index);
 	Group *group;
-	int ok = 0;
+	bool ok = false;
 	
 	if (ob == NULL)
 		return OPERATOR_CANCELLED;
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index e67381a1d43..670e2f2d4ac 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -542,7 +542,7 @@ static int object_add_hook_selob_exec(bContext *C, wmOperator *op)
 	Scene *scene = CTX_data_scene(C);
 	Object *obedit = CTX_data_edit_object(C);
 	Object *obsel = NULL;
-	const int use_bone = RNA_boolean_get(op->ptr, "use_bone");
+	const bool use_bone = RNA_boolean_get(op->ptr, "use_bone");
 	const int mode = use_bone ? OBJECT_ADDHOOK_SELOB_BONE : OBJECT_ADDHOOK_SELOB;
 	
 	CTX_DATA_BEGIN (C, Object *, ob, selected_objects)
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index b0d3d363c45..3493f6bf778 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -375,7 +375,7 @@ static void ignore_parent_tx(Main *bmain, Scene *scene, Object *ob)
 	}
 }
 
-static int apply_objects_internal(bContext *C, ReportList *reports, int apply_loc, int apply_rot, int apply_scale)
+static int apply_objects_internal(bContext *C, ReportList *reports, bool apply_loc, bool apply_rot, bool apply_scale)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
@@ -647,9 +647,9 @@ void OBJECT_OT_visual_transform_apply(wmOperatorType *ot)
 
 static int object_transform_apply_exec(bContext *C, wmOperator *op)
 {
-	const int loc = RNA_boolean_get(op->ptr, "location");
-	const int rot = RNA_boolean_get(op->ptr, "rotation");
-	const int sca = RNA_boolean_get(op->ptr, "scale");
+	const bool loc = RNA_boolean_get(op->ptr, "location");
+	const bool rot = RNA_boolean_get(op->ptr, "rotation");
+	const bool sca = RNA_boolean_get(op->ptr, "scale");
 
 	if (loc || rot || sca) {
 		return apply_objects_internal(C, op->reports, loc, rot, sca);