[Bf-blender-cvs] [3f4f28082f9] temp-spreadsheet-row-filter: Fix build error after merging master
Hans Goudey
noreply at git.blender.org
Fri Jun 4 14:17:52 CEST 2021
Commit: 3f4f28082f95d2e4e93ae9d608c975d8c762fa68
Author: Hans Goudey
Date: Fri Jun 4 08:17:41 2021 -0400
Branches: temp-spreadsheet-row-filter
https://developer.blender.org/rB3f4f28082f95d2e4e93ae9d608c975d8c762fa68
Fix build error after merging master
===================================================================
M source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
===================================================================
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
index d656dfbb788..87e3bd02ec6 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
@@ -210,7 +210,7 @@ static void apply_row_filter(const SpreadsheetLayout &spreadsheet_layout,
break;
}
case SPREADSHEET_VALUE_TYPE_COLOR: {
- const Color4f value = row_filter.value_color;
+ const ColorGeometry4f value = row_filter.value_color;
switch (row_filter.operation) {
case SPREADSHEET_ROW_FILTER_EQUAL: {
const float threshold_squared = row_filter.threshold * row_filter.threshold;
More information about the Bf-blender-cvs
mailing list