diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2021-05-25 18:03:54 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-05-25 18:03:54 +0300 |
| commit | 00955cd31eda95aca619842064d22663af4c812b (patch) | |
| tree | 85a4650d260f2fdc250d433d51d7309b77f08510 /source/blender/editors/space_spreadsheet | |
| parent | fd94e033446c72fb92048a9864c1d539fccde59a (diff) | |
Revert "Blenlib: Explicit Colors."
This reverts commit fd94e033446c72fb92048a9864c1d539fccde59a.
does not compile against latest master.
Diffstat (limited to 'source/blender/editors/space_spreadsheet')
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_cell_value.hh b/source/blender/editors/space_spreadsheet/spreadsheet_cell_value.hh index c9b73aabf96..d1e80f1d87e 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_cell_value.hh +++ b/source/blender/editors/space_spreadsheet/spreadsheet_cell_value.hh @@ -50,7 +50,7 @@ class CellValue { std::optional<bool> value_bool; std::optional<float2> value_float2; std::optional<float3> value_float3; - std::optional<ColorGeometry4f> value_color; + std::optional<Color4f> value_color; std::optional<ObjectCellValue> value_object; std::optional<CollectionCellValue> value_collection; }; 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 452885959f6..02ffa1259fc 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc @@ -116,7 +116,7 @@ std::unique_ptr<ColumnValues> GeometryDataSource::get_column_values( column_id.name, domain_size, [varray](int index, CellValue &r_cell_value) { - ColorGeometry4f value; + Color4f value; varray->get(index, &value); r_cell_value.value_color = value; }, diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc b/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc index 8079763a339..f1ca65817f6 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc @@ -170,7 +170,7 @@ class SpreadsheetLayoutDrawer : public SpreadsheetDrawer { this->draw_float_vector(params, Span(&value.x, 3)); } else if (cell_value.value_color.has_value()) { - const ColorGeometry4f value = *cell_value.value_color; + const Color4f value = *cell_value.value_color; this->draw_float_vector(params, Span(&value.r, 4)); } else if (cell_value.value_object.has_value()) { |