[Bf-blender-cvs] [b037816980d] master: Cleanup: shadow warning, clang-format

[Campbell Barton]

Commit: b037816980dee7a74128c23eface983b9850d4a9
Author: Campbell Barton
Date:   Sun Mar 15 17:32:06 2020 +1100
Branches: master
https://developer.blender.org/rBb037816980dee7a74128c23eface983b9850d4a9

Cleanup: shadow warning, clang-format

===================================================================

M	source/blender/editors/gpencil/gpencil_select.c
M	source/blender/editors/include/UI_interface.h
M	source/blender/editors/interface/interface_icons.c
M	source/blender/editors/space_image/image_ops.c

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c
index ee9e91d0e81..f479905f0d7 100644
--- a/source/blender/editors/gpencil/gpencil_select.c
+++ b/source/blender/editors/gpencil/gpencil_select.c
@@ -1784,7 +1784,6 @@ static int gpencil_select_vertex_color_exec(bContext *C, wmOperator *op)
       /* Extend stroke selection. */
       if (selectmode == GP_SELECTMODE_STROKE) {
         bGPDspoint *pt1 = NULL;
-        int i;
 
         for (i = 0, pt1 = gps->points; i < gps->totpoints; i++, pt1++) {
           pt1->flag |= GP_SPOINT_SELECT;
@@ -1830,15 +1829,16 @@ void GPENCIL_OT_select_vertex_color(wmOperatorType *ot)
   ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
   /* properties */
-  prop = RNA_def_int(ot->srna,
-                     "threshold",
-                     0,
-                     0,
-                     6,
-                     "Threshold",
-                     "Tolerance of the selection. Higher values select a wider range of similar colors",
-                     0,
-                     6);
+  prop = RNA_def_int(
+      ot->srna,
+      "threshold",
+      0,
+      0,
+      6,
+      "Threshold",
+      "Tolerance of the selection. Higher values select a wider range of similar colors",
+      0,
+      6);
   /* avoid re-using last var */
   RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 71263a65a36..6a88ef2468e 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -1126,8 +1126,7 @@ uiBut *uiDefIconButO_ptr(uiBlock *block,
                          const char *tip);
 uiBut *uiDefButImage(
     uiBlock *block, void *imbuf, int x, int y, short width, short height, const uchar color[4]);
-uiBut *uiDefButAlert(
-    uiBlock *block, int icon, int x, int y, short width, short height);
+uiBut *uiDefButAlert(uiBlock *block, int icon, int x, int y, short width, short height);
 uiBut *uiDefIconTextBut(uiBlock *block,
                         int type,
                         int retval,
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 8dd449b4b67..a37b49f5b6e 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -183,9 +183,9 @@ static const IconType icontypes[] = {
 
 ImBuf *UI_alert_image(eAlertIcon icon)
 {
-# ifdef WITH_HEADLESS
+#  ifdef WITH_HEADLESS
   return NULL
-# else
+#  else
   ImBuf *ibuf;
   icon = MIN2(icon, ALERT_ICON_MAX - 1);
   const int left = icon * ALERT_IMG_SIZE;
@@ -198,7 +198,7 @@ ImBuf *UI_alert_image(eAlertIcon icon)
   IMB_rect_crop(ibuf, &crop);
   IMB_premultiply_alpha(ibuf);
   return ibuf;
-#endif
+#  endif
 }
 
 /* **************************************************** */
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 8710b02e2a5..c62fd53431b 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -2376,10 +2376,8 @@ int ED_image_save_all_modified_info(const Main *bmain, ReportList *reports)
           }
         }
         else {
-          BKE_reportf(reports,
-                      RPT_WARNING,
-                      "Image can't be saved, no valid file path: \"%s\"",
-                      ima->name);
+          BKE_reportf(
+              reports, RPT_WARNING, "Image can't be saved, no valid file path: \"%s\"", ima->name);
         }
       }
     }