[Bf-blender-cvs] [1d8983c5494] temp-spreadsheet-row-filter: Use StringRefNull
Hans Goudey
noreply at git.blender.org
Mon Apr 19 23:53:37 CEST 2021
Commit: 1d8983c549448c96a71e15d0da5a709394ac2ec2
Author: Hans Goudey
Date: Mon Apr 19 16:39:23 2021 -0500
Branches: temp-spreadsheet-row-filter
https://developer.blender.org/rB1d8983c549448c96a71e15d0da5a709394ac2ec2
Use StringRefNull
===================================================================
M source/blender/editors/space_spreadsheet/spreadsheet_column.cc
M source/blender/editors/space_spreadsheet/spreadsheet_column.hh
===================================================================
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_column.cc b/source/blender/editors/space_spreadsheet/spreadsheet_column.cc
index 1db7e35ff3b..f4e19671c4d 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_column.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_column.cc
@@ -59,10 +59,10 @@ SpreadsheetColumn *spreadsheet_column_new(SpreadsheetColumnID *column_id)
void spreadsheet_column_assign_runtime_data(SpreadsheetColumn *column,
const eSpreadsheetColumnValueType data_type,
- const StringRef display_name)
+ const StringRefNull display_name)
{
column->data_type = data_type;
- column->display_name = BLI_strdup(display_name.data());
+ column->display_name = BLI_strdup(display_name.c_str());
}
SpreadsheetColumn *spreadsheet_column_copy(const SpreadsheetColumn *src_column)
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_column.hh b/source/blender/editors/space_spreadsheet/spreadsheet_column.hh
index 8a62ab415f6..b26fc2c756a 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_column.hh
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_column.hh
@@ -45,7 +45,7 @@ SpreadsheetColumn *spreadsheet_column_new(SpreadsheetColumnID *column_id);
SpreadsheetColumn *spreadsheet_column_copy(const SpreadsheetColumn *src_column);
void spreadsheet_column_assign_runtime_data(SpreadsheetColumn *column,
const eSpreadsheetColumnValueType data_type,
- const StringRef display_name);
+ const StringRefNull display_name);
void spreadsheet_column_free(SpreadsheetColumn *column);
} // namespace blender::ed::spreadsheet
More information about the Bf-blender-cvs
mailing list