diff options
Diffstat (limited to 'source/blender/editors/space_spreadsheet/spreadsheet_layout.cc')
| -rw-r--r-- | source/blender/editors/space_spreadsheet/spreadsheet_layout.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc b/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc index 3fe4c7c8ee0..06eb338bd00 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc @@ -6,6 +6,7 @@ #include "BLI_math_vec_types.hh" #include "BKE_geometry_set.hh" +#include "BKE_instances.hh" #include "spreadsheet_column_values.hh" #include "spreadsheet_layout.hh" @@ -197,10 +198,10 @@ class SpreadsheetLayoutDrawer : public SpreadsheetDrawer { const ColorGeometry4b value = data.get<ColorGeometry4b>(real_index); this->draw_byte_color(params, value); } - else if (data.type().is<InstanceReference>()) { - const InstanceReference value = data.get<InstanceReference>(real_index); + else if (data.type().is<bke::InstanceReference>()) { + const bke::InstanceReference value = data.get<bke::InstanceReference>(real_index); switch (value.type()) { - case InstanceReference::Type::Object: { + case bke::InstanceReference::Type::Object: { const Object &object = value.object(); uiDefIconTextBut(params.block, UI_BTYPE_LABEL, @@ -219,7 +220,7 @@ class SpreadsheetLayoutDrawer : public SpreadsheetDrawer { nullptr); break; } - case InstanceReference::Type::Collection: { + case bke::InstanceReference::Type::Collection: { Collection &collection = value.collection(); uiDefIconTextBut(params.block, UI_BTYPE_LABEL, @@ -238,7 +239,7 @@ class SpreadsheetLayoutDrawer : public SpreadsheetDrawer { nullptr); break; } - case InstanceReference::Type::GeometrySet: { + case bke::InstanceReference::Type::GeometrySet: { uiDefIconTextBut(params.block, UI_BTYPE_LABEL, 0, @@ -256,7 +257,7 @@ class SpreadsheetLayoutDrawer : public SpreadsheetDrawer { nullptr); break; } - case InstanceReference::Type::None: { + case bke::InstanceReference::Type::None: { break; } } @@ -283,7 +284,7 @@ class SpreadsheetLayoutDrawer : public SpreadsheetDrawer { void draw_float_vector(const CellDrawParams ¶ms, const Span<float> values) const { BLI_assert(!values.is_empty()); - const float segment_width = (float)params.width / values.size(); + const float segment_width = float(params.width) / values.size(); for (const int i : values.index_range()) { std::stringstream ss; const float value = values[i]; @@ -314,7 +315,7 @@ class SpreadsheetLayoutDrawer : public SpreadsheetDrawer { { const ColorGeometry4f float_color = color.decode(); Span<float> values(&float_color.r, 4); - const float segment_width = (float)params.width / values.size(); + const float segment_width = float(params.width) / values.size(); for (const int i : values.index_range()) { std::stringstream ss; const float value = values[i]; @@ -342,7 +343,7 @@ class SpreadsheetLayoutDrawer : public SpreadsheetDrawer { /* Tooltip showing raw byte values. Encode values in pointer to avoid memory allocation. */ UI_but_func_tooltip_set( but, - [](bContext * /*C*/, void *argN, const char *UNUSED(tip)) { + [](bContext * /*C*/, void *argN, const char * /*tip*/) { const uint32_t uint_color = POINTER_AS_UINT(argN); ColorGeometry4b color = *(ColorGeometry4b *)&uint_color; return BLI_sprintfN(TIP_("Byte Color (sRGB encoded):\n%3d %3d %3d %3d"), |