[Bf-blender-cvs] [2373a2196e2] master: Cleanup: duplicate checks, unused initialization

[Campbell Barton]

Commit: 2373a2196e21b35998961fff2f53c5fa98036cd8
Author: Campbell Barton
Date:   Tue Jul 13 22:41:06 2021 +1000
Branches: master
https://developer.blender.org/rB2373a2196e21b35998961fff2f53c5fa98036cd8

Cleanup: duplicate checks, unused initialization

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

M	source/blender/editors/interface/interface_widgets.c
M	source/blender/editors/space_outliner/tree/tree_display_override_library.cc
M	source/blender/editors/space_sequencer/sequencer_scopes.c
M	source/blender/imbuf/intern/bmp.c

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

diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 7b2e0fec1d0..72847fb2476 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1377,8 +1377,6 @@ static int ui_but_draw_menu_icon(const uiBut *but)
 static void widget_draw_icon(
     const uiBut *but, BIFIconID icon, float alpha, const rcti *rect, const uchar mono_color[4])
 {
-  float xs = 0.0f, ys = 0.0f;
-
   if (but->flag & UI_BUT_ICON_PREVIEW) {
     GPU_blend(GPU_BLEND_ALPHA);
     widget_draw_preview(icon, alpha, rect);
@@ -1420,6 +1418,7 @@ static void widget_draw_icon(
 
   if (icon && icon != ICON_BLANK1) {
     const float ofs = 1.0f / aspect;
+    float xs, ys;
 
     if (but->drawflag & UI_BUT_ICON_LEFT) {
       /* special case - icon_only pie buttons */
diff --git a/source/blender/editors/space_outliner/tree/tree_display_override_library.cc b/source/blender/editors/space_outliner/tree/tree_display_override_library.cc
index 3059f8bfe0c..a17bf174a74 100644
--- a/source/blender/editors/space_outliner/tree/tree_display_override_library.cc
+++ b/source/blender/editors/space_outliner/tree/tree_display_override_library.cc
@@ -150,27 +150,25 @@ TreeElement *TreeDisplayOverrideLibrary::add_library_contents(Main &mainvar,
       }
 
       /* Create data-block list parent element on demand. */
-      if (id != nullptr) {
-        TreeElement *ten;
+      TreeElement *ten;
 
-        if (filter_id_type) {
-          ten = tenlib;
-        }
-        else {
-          ten = outliner_add_element(
-              &space_outliner_, &tenlib->subtree, lbarray[a], nullptr, TSE_ID_BASE, 0);
-          ten->directdata = lbarray[a];
-          ten->name = outliner_idcode_to_plural(GS(id->name));
-        }
+      if (filter_id_type) {
+        ten = tenlib;
+      }
+      else {
+        ten = outliner_add_element(
+            &space_outliner_, &tenlib->subtree, lbarray[a], nullptr, TSE_ID_BASE, 0);
+        ten->directdata = lbarray[a];
+        ten->name = outliner_idcode_to_plural(GS(id->name));
+      }
 
-        for (ID *id : List<ID>(lbarray[a])) {
-          if (override_library_id_filter_poll(lib, id)) {
-            TreeElement *override_tree_element = outliner_add_element(
-                &space_outliner_, &ten->subtree, id, ten, TSE_LIBRARY_OVERRIDE_BASE, 0);
+      for (ID *id : List<ID>(lbarray[a])) {
+        if (override_library_id_filter_poll(lib, id)) {
+          TreeElement *override_tree_element = outliner_add_element(
+              &space_outliner_, &ten->subtree, id, ten, TSE_LIBRARY_OVERRIDE_BASE, 0);
 
-            if (BLI_listbase_is_empty(&override_tree_element->subtree)) {
-              outliner_free_tree_element(override_tree_element, &ten->subtree);
-            }
+          if (BLI_listbase_is_empty(&override_tree_element->subtree)) {
+            outliner_free_tree_element(override_tree_element, &ten->subtree);
           }
         }
       }
diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c
index 8cc8b4a007b..5d857f62b47 100644
--- a/source/blender/editors/space_sequencer/sequencer_scopes.c
+++ b/source/blender/editors/space_sequencer/sequencer_scopes.c
@@ -624,8 +624,6 @@ static void vectorscope_put_cross(uchar r, uchar g, uchar b, char *tgt, int w, i
 {
   float rgb[3], yuv[3];
   char *p;
-  int x = 0;
-  int y = 0;
 
   rgb[0] = (float)r / 255.0f;
   rgb[1] = (float)g / 255.0f;
@@ -638,8 +636,8 @@ static void vectorscope_put_cross(uchar r, uchar g, uchar b, char *tgt, int w, i
     r = 255;
   }
 
-  for (y = -size; y <= size; y++) {
-    for (x = -size; x <= size; x++) {
+  for (int y = -size; y <= size; y++) {
+    for (int x = -size; x <= size; x++) {
       char *q = p + 4 * (y * w + x);
       q[0] = r;
       q[1] = g;
diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c
index ad72f373d12..70bb70ec4fa 100644
--- a/source/blender/imbuf/intern/bmp.c
+++ b/source/blender/imbuf/intern/bmp.c
@@ -395,9 +395,8 @@ bool imb_savebmp(ImBuf *ibuf, const char *filepath, int UNUSED(flags))
       }
     }
   }
-  if (ofile) {
-    fflush(ofile);
-    fclose(ofile);
-  }
+
+  fflush(ofile);
+  fclose(ofile);
   return 1;
 }