[Bf-blender-cvs] [978ef093db0] master: Cleanup: fix compiler warnings

[Jacques Lucke]

Commit: 978ef093db0b1424b2bff73f7973bcf9e0a96b2d
Author: Jacques Lucke
Date:   Thu Nov 4 11:29:04 2021 +0100
Branches: master
https://developer.blender.org/rB978ef093db0b1424b2bff73f7973bcf9e0a96b2d

Cleanup: fix compiler warnings

Those were introduced in rBccead2ed9c6121c42a516712da38a2faec877e2f.

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

M	source/blender/editors/space_spreadsheet/space_spreadsheet.cc
M	source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
M	source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc

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

diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
index d54af7ffe2c..50b67c55bd6 100644
--- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
+++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
@@ -319,6 +319,8 @@ static float get_default_column_width(const ColumnValues &values)
       return 4.0f * float_width;
     case SPREADSHEET_VALUE_TYPE_INSTANCES:
       return 8.0f;
+    case SPREADSHEET_VALUE_TYPE_STRING:
+      return 5.0f;
   }
   return float_width;
 }
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
index 04784dc3e2b..cf048d1bbd8 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
@@ -565,6 +565,8 @@ std::unique_ptr<ColumnValues> VolumeDataSource::get_column_values(
         },
         5.0f);
   }
+#else
+  UNUSED_VARS(column_id);
 #endif
 
   return {};
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
index d56049990b4..a07abac4474 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
@@ -105,12 +105,15 @@ static std::string value_string(const SpreadsheetRowFilter &row_filter,
         return row_filter.value_string;
       }
       return "";
-    case SPREADSHEET_VALUE_TYPE_COLOR:
+    case SPREADSHEET_VALUE_TYPE_COLOR: {
       std::ostringstream result;
       result.precision(3);
       result << std::fixed << "(" << row_filter.value_color[0] << ", " << row_filter.value_color[1]
              << ", " << row_filter.value_color[2] << ", " << row_filter.value_color[3] << ")";
       return result.str();
+    }
+    case SPREADSHEET_VALUE_TYPE_STRING:
+      return row_filter.value_string;
   }
   BLI_assert_unreachable();
   return "";
@@ -234,6 +237,8 @@ static void spreadsheet_filter_panel_draw(const bContext *C, Panel *panel)
       uiItemR(layout, filter_ptr, "value_color", 0, IFACE_("Value"), ICON_NONE);
       uiItemR(layout, filter_ptr, "threshold", 0, nullptr, ICON_NONE);
       break;
+    case SPREADSHEET_VALUE_TYPE_STRING:
+      break;
   }
 }