Cleanup: Return bool instead of int

2 files changed, 42 insertions, 42 deletions

diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 73326a2d5f2..5dfce6071f0 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -462,25 +462,25 @@ bool ED_object_gpencil_modifier_remove(struct ReportList *reports,
                                        struct Object *ob,
                                        struct GpencilModifierData *md);
 void ED_object_gpencil_modifier_clear(struct Main *bmain, struct Object *ob);
-int ED_object_gpencil_modifier_move_down(struct ReportList *reports,
-                                         struct Object *ob,
-                                         struct GpencilModifierData *md);
-int ED_object_gpencil_modifier_move_up(struct ReportList *reports,
-                                       struct Object *ob,
-                                       struct GpencilModifierData *md);
+bool ED_object_gpencil_modifier_move_down(struct ReportList *reports,
+                                          struct Object *ob,
+                                          struct GpencilModifierData *md);
+bool ED_object_gpencil_modifier_move_up(struct ReportList *reports,
+                                        struct Object *ob,
+                                        struct GpencilModifierData *md);
 bool ED_object_gpencil_modifier_move_to_index(struct ReportList *reports,
                                               struct Object *ob,
                                               struct GpencilModifierData *md,
                                               const int index);
-int ED_object_gpencil_modifier_apply(struct Main *bmain,
-                                     struct ReportList *reports,
-                                     struct Depsgraph *depsgraph,
+bool ED_object_gpencil_modifier_apply(struct Main *bmain,
+                                      struct ReportList *reports,
+                                      struct Depsgraph *depsgraph,
+                                      struct Object *ob,
+                                      struct GpencilModifierData *md,
+                                      int mode);
+bool ED_object_gpencil_modifier_copy(struct ReportList *reports,
                                      struct Object *ob,
-                                     struct GpencilModifierData *md,
-                                     int mode);
-int ED_object_gpencil_modifier_copy(struct ReportList *reports,
-                                    struct Object *ob,
-                                    struct GpencilModifierData *md);
+                                     struct GpencilModifierData *md);
 void ED_object_gpencil_modifier_copy_to_object(struct Object *ob_dst,
                                                struct GpencilModifierData *md);
 
diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c
index f70e86bcb05..a869a4c2583 100644
--- a/source/blender/editors/object/object_gpencil_modifier.c
+++ b/source/blender/editors/object/object_gpencil_modifier.c
@@ -173,28 +173,28 @@ void ED_object_gpencil_modifier_clear(Main *bmain, Object *ob)
   DEG_relations_tag_update(bmain);
 }
 
-int ED_object_gpencil_modifier_move_up(ReportList *UNUSED(reports),
-                                       Object *ob,
-                                       GpencilModifierData *md)
+bool ED_object_gpencil_modifier_move_up(ReportList *UNUSED(reports),
+                                        Object *ob,
+                                        GpencilModifierData *md)
 {
   if (md->prev) {
     BLI_remlink(&ob->greasepencil_modifiers, md);
     BLI_insertlinkbefore(&ob->greasepencil_modifiers, md->prev, md);
   }
 
-  return 1;
+  return true;
 }
 
-int ED_object_gpencil_modifier_move_down(ReportList *UNUSED(reports),
-                                         Object *ob,
-                                         GpencilModifierData *md)
+bool ED_object_gpencil_modifier_move_down(ReportList *UNUSED(reports),
+                                          Object *ob,
+                                          GpencilModifierData *md)
 {
   if (md->next) {
     BLI_remlink(&ob->greasepencil_modifiers, md);
     BLI_insertlinkafter(&ob->greasepencil_modifiers, md->next, md);
   }
 
-  return 1;
+  return true;
 }
 
 bool ED_object_gpencil_modifier_move_to_index(ReportList *reports,
@@ -234,57 +234,57 @@ bool ED_object_gpencil_modifier_move_to_index(ReportList *reports,
   return true;
 }
 
-static int gpencil_modifier_apply_obdata(
+static bool gpencil_modifier_apply_obdata(
     ReportList *reports, Main *bmain, Depsgraph *depsgraph, Object *ob, GpencilModifierData *md)
 {
   const GpencilModifierTypeInfo *mti = BKE_gpencil_modifier_get_info(md->type);
 
   if (mti->isDisabled && mti->isDisabled(md, 0)) {
     BKE_report(reports, RPT_ERROR, "Modifier is disabled, skipping apply");
-    return 0;
+    return false;
   }
 
   if (ob->type == OB_GPENCIL) {
     if (ELEM(NULL, ob, ob->data)) {
-      return 0;
+      return false;
     }
     if (mti->bakeModifier == NULL) {
       BKE_report(reports, RPT_ERROR, "Not implemented");
-      return 0;
+      return false;
     }
     mti->bakeModifier(bmain, depsgraph, md, ob);
     DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
   }
   else {
     BKE_report(reports, RPT_ERROR, "Cannot apply modifier for this object type");
-    return 0;
+    return false;
   }
 
-  return 1;
+  return true;
 }
 
-int ED_object_gpencil_modifier_apply(Main *bmain,
-                                     ReportList *reports,
-                                     Depsgraph *depsgraph,
-                                     Object *ob,
-                                     GpencilModifierData *md,
-                                     int UNUSED(mode))
+bool ED_object_gpencil_modifier_apply(Main *bmain,
+                                      ReportList *reports,
+                                      Depsgraph *depsgraph,
+                                      Object *ob,
+                                      GpencilModifierData *md,
+                                      int UNUSED(mode))
 {
 
   if (ob->type == OB_GPENCIL) {
     if (ob->mode != OB_MODE_OBJECT) {
       BKE_report(reports, RPT_ERROR, "Modifiers cannot be applied in paint, sculpt or edit mode");
-      return 0;
+      return false;
     }
 
     if (((ID *)ob->data)->us > 1) {
       BKE_report(reports, RPT_ERROR, "Modifiers cannot be applied to multi-user data");
-      return 0;
+      return false;
     }
   }
   else if (((ID *)ob->data)->us > 1) {
     BKE_report(reports, RPT_ERROR, "Modifiers cannot be applied to multi-user data");
-    return 0;
+    return false;
   }
 
   if (md != ob->greasepencil_modifiers.first) {
@@ -292,16 +292,16 @@ int ED_object_gpencil_modifier_apply(Main *bmain,
   }
 
   if (!gpencil_modifier_apply_obdata(reports, bmain, depsgraph, ob, md)) {
-    return 0;
+    return false;
   }
 
   BLI_remlink(&ob->greasepencil_modifiers, md);
   BKE_gpencil_modifier_free(md);
 
-  return 1;
+  return true;
 }
 
-int ED_object_gpencil_modifier_copy(ReportList *reports, Object *ob, GpencilModifierData *md)
+bool ED_object_gpencil_modifier_copy(ReportList *reports, Object *ob, GpencilModifierData *md)
 {
   GpencilModifierData *nmd;
   const GpencilModifierTypeInfo *mti = BKE_gpencil_modifier_get_info(md->type);
@@ -310,7 +310,7 @@ int ED_object_gpencil_modifier_copy(ReportList *reports, Object *ob, GpencilModi
   if (mti->flags & eGpencilModifierTypeFlag_Single) {
     if (BKE_gpencil_modifiers_findby_type(ob, type)) {
       BKE_report(reports, RPT_WARNING, "Only one modifier of this type is allowed");
-      return 0;
+      return false;
     }
   }
 
@@ -321,7 +321,7 @@ int ED_object_gpencil_modifier_copy(ReportList *reports, Object *ob, GpencilModi
 
   nmd->flag |= eGpencilModifierFlag_OverrideLibrary_Local;
 
-  return 1;
+  return true;
 }
 
 void ED_object_gpencil_modifier_copy_to_object(Object *ob_dst, GpencilModifierData *md)