blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Cleanup: fix compiler warnings 

Those were introduced in rBccead2ed9c6121c42a516712da38a2faec877e2f.
This commit is contained in:
Jacques Lucke 2021-11-04 11:29:04 +01:00
parent 2d6d8fc7ca
commit 978ef093db
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_spreadsheet/space_spreadsheet.cc
View File

@ -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;
}

2
source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
View File

@ -565,6 +565,8 @@ std::unique_ptr<ColumnValues> VolumeDataSource::get_column_values(
},
5.0f);
}
#else
UNUSED_VARS(column_id);
#endif
return {};

7
source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
View File

@ -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;
}
}