Cleanup: clang-format (re-run after v12 version bump)

9 files changed, 41 insertions, 24 deletions

diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 87688ee343c..e5dc9a83ebb 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -966,7 +966,7 @@ static int acf_group_setting_flag(bAnimContext *ac, eAnimChannel_Settings settin
        * proved to be a hazard for workflows...
        */
       return (ac->spacetype == SPACE_GRAPH) ? AGRP_EXPANDED_G : /* Graph Editor case */
-                 AGRP_EXPANDED;                                 /* DopeSheet and elsewhere */
+                                              AGRP_EXPANDED;                                 /* DopeSheet and elsewhere */
     }
 
     case ACHANNEL_SETTING_MUTE: /* muted */
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 227af598f53..cfcea950955 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -483,7 +483,8 @@ static int marker_get_icon_id(TimeMarker *marker, int flag)
 {
   if (flag & DRAW_MARKERS_LOCAL) {
     return (marker->flag & ACTIVE) ? ICON_PMARKER_ACT :
-                                     (marker->flag & SELECT) ? ICON_PMARKER_SEL : ICON_PMARKER;
+           (marker->flag & SELECT) ? ICON_PMARKER_SEL :
+                                     ICON_PMARKER;
   }
 #ifdef DURIAN_CAMERA_SWITCH
   if (marker->camera) {
diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c
index ea6c71fd33f..fd5ae6c7099 100644
--- a/source/blender/editors/armature/armature_edit.c
+++ b/source/blender/editors/armature/armature_edit.c
@@ -286,8 +286,9 @@ static int armature_calc_roll_exec(bContext *C, wmOperator *op)
   eCalcRollTypes type = RNA_enum_get(op->ptr, "type");
   const bool axis_only = RNA_boolean_get(op->ptr, "axis_only");
   /* axis_flip when matching the active bone never makes sense */
-  bool axis_flip = ((type >= CALC_ROLL_ACTIVE) ? RNA_boolean_get(op->ptr, "axis_flip") :
-                                                 (type >= CALC_ROLL_TAN_NEG_X) ? true : false);
+  bool axis_flip = ((type >= CALC_ROLL_ACTIVE)    ? RNA_boolean_get(op->ptr, "axis_flip") :
+                    (type >= CALC_ROLL_TAN_NEG_X) ? true :
+                                                    false);
 
   uint objects_len = 0;
   Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(
diff --git a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c
index 31ab5eca974..a4a034830b7 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c
@@ -374,7 +374,7 @@ short ED_gizmotypes_snap_3d_update(wmGizmo *gz,
 
     eSnapEditType edit_mode_type = (snap_gizmo->flag & ED_SNAPGIZMO_SNAP_EDIT_GEOM_FINAL) ?
                                        SNAP_GEOM_FINAL :
-                                       (snap_gizmo->flag & ED_SNAPGIZMO_SNAP_EDIT_GEOM_CAGE) ?
+                                   (snap_gizmo->flag & ED_SNAPGIZMO_SNAP_EDIT_GEOM_CAGE) ?
                                        SNAP_GEOM_CAGE :
                                        SNAP_GEOM_EDIT;
 
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index 655fdda3069..65104885d98 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -106,14 +106,30 @@ void UI_draw_roundbox_4fv_ex(const rctf *rect,
       .color_inner1[1] = inner1 ? inner1[1] : 0.0f,
       .color_inner1[2] = inner1 ? inner1[2] : 0.0f,
       .color_inner1[3] = inner1 ? inner1[3] : 0.0f,
-      .color_inner2[0] = inner2 ? inner2[0] : inner1 ? inner1[0] : 0.0f,
-      .color_inner2[1] = inner2 ? inner2[1] : inner1 ? inner1[1] : 0.0f,
-      .color_inner2[2] = inner2 ? inner2[2] : inner1 ? inner1[2] : 0.0f,
-      .color_inner2[3] = inner2 ? inner2[3] : inner1 ? inner1[3] : 0.0f,
-      .color_outline[0] = outline ? outline[0] : inner1 ? inner1[0] : 0.0f,
-      .color_outline[1] = outline ? outline[1] : inner1 ? inner1[1] : 0.0f,
-      .color_outline[2] = outline ? outline[2] : inner1 ? inner1[2] : 0.0f,
-      .color_outline[3] = outline ? outline[3] : inner1 ? inner1[3] : 0.0f,
+      .color_inner2[0] = inner2 ? inner2[0] :
+                         inner1 ? inner1[0] :
+                                  0.0f,
+      .color_inner2[1] = inner2 ? inner2[1] :
+                         inner1 ? inner1[1] :
+                                  0.0f,
+      .color_inner2[2] = inner2 ? inner2[2] :
+                         inner1 ? inner1[2] :
+                                  0.0f,
+      .color_inner2[3] = inner2 ? inner2[3] :
+                         inner1 ? inner1[3] :
+                                  0.0f,
+      .color_outline[0] = outline ? outline[0] :
+                          inner1  ? inner1[0] :
+                                    0.0f,
+      .color_outline[1] = outline ? outline[1] :
+                          inner1  ? inner1[1] :
+                                    0.0f,
+      .color_outline[2] = outline ? outline[2] :
+                          inner1  ? inner1[2] :
+                                    0.0f,
+      .color_outline[3] = outline ? outline[3] :
+                          inner1  ? inner1[3] :
+                                    0.0f,
       .shade_dir = shade_dir,
       .alpha_discard = 1.0f,
   };
diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c
index 0a4fecde6ea..8b78b091fd2 100644
--- a/source/blender/editors/mesh/editmesh_loopcut.c
+++ b/source/blender/editors/mesh/editmesh_loopcut.c
@@ -187,7 +187,8 @@ static void ringsel_finish(bContext *C, wmOperator *op)
       const bool is_edge_wire = BM_edge_is_wire(lcd->eed);
       const bool is_single = is_edge_wire || !BM_edge_is_any_face_len_test(lcd->eed, 4);
       const int seltype = is_edge_wire ? SUBDIV_SELECT_INNER :
-                                         is_single ? SUBDIV_SELECT_NONE : SUBDIV_SELECT_LOOPCUT;
+                          is_single    ? SUBDIV_SELECT_NONE :
+                                         SUBDIV_SELECT_LOOPCUT;
 
       /* Enable grid-fill, so that intersecting loop-cut works as one would expect.
        * Note though that it will break edge-slide in this specific case.
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 7bbca7ea9e6..e9142742d15 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -1923,8 +1923,8 @@ static int multires_subdivide_exec(bContext *C, wmOperator *op)
     return OPERATOR_CANCELLED;
   }
 
-  const eMultiresSubdivideModeType subdivide_mode = (eMultiresSubdivideModeType)(
-      RNA_enum_get(op->ptr, "mode"));
+  const eMultiresSubdivideModeType subdivide_mode = (eMultiresSubdivideModeType)(RNA_enum_get(
+      op->ptr, "mode"));
   multiresModifier_subdivide(object, mmd, subdivide_mode);
 
   ED_object_iter_other(
diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c
index 062d2e2b5d1..6538f5709b7 100644
--- a/source/blender/editors/space_outliner/outliner_collections.c
+++ b/source/blender/editors/space_outliner/outliner_collections.c
@@ -912,10 +912,9 @@ static int collection_view_layer_exec(bContext *C, wmOperator *op)
       .space_outliner = space_outliner,
   };
   bool clear = strstr(op->idname, "clear") != NULL;
-  int flag = strstr(op->idname, "holdout") ?
-                 LAYER_COLLECTION_HOLDOUT :
-                 strstr(op->idname, "indirect_only") ? LAYER_COLLECTION_INDIRECT_ONLY :
-                                                       LAYER_COLLECTION_EXCLUDE;
+  int flag = strstr(op->idname, "holdout")       ? LAYER_COLLECTION_HOLDOUT :
+             strstr(op->idname, "indirect_only") ? LAYER_COLLECTION_INDIRECT_ONLY :
+                                                   LAYER_COLLECTION_EXCLUDE;
 
   data.collections_to_edit = BLI_gset_ptr_new(__func__);
 
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c
index 080a19cce1f..279dca9731d 100644
--- a/source/blender/editors/transform/transform_gizmo_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_3d.c
@@ -354,10 +354,9 @@ static void gizmo_get_axis_color(const int axis_idx,
       if (is_plane) {
         idot_axis = 1.0f - idot_axis;
       }
-      alpha_fac = ((idot_axis > idot_max) ?
-                       1.0f :
-                       (idot_axis < idot_min) ? 0.0f :
-                                                ((idot_axis - idot_min) / (idot_max - idot_min)));
+      alpha_fac = ((idot_axis > idot_max) ? 1.0f :
+                   (idot_axis < idot_min) ? 0.0f :
+                                            ((idot_axis - idot_min) / (idot_max - idot_min)));
     }
     else {
       alpha_fac = 1.0f;