From 2252bc6a5527cd7360d1ccfe7a2d1bc640a8dfa6 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Fri, 18 Mar 2022 10:57:45 +0100 Subject: BLI: move CPPType to blenlib For more detail about `CPPType`, see `BLI_cpp_type.hh` and D14367. Differential Revision: https://developer.blender.org/D14367 --- source/blender/editors/space_spreadsheet/spreadsheet_column.cc | 5 ++--- .../blender/editors/space_spreadsheet/spreadsheet_column_values.hh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/space_spreadsheet') diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_column.cc b/source/blender/editors/space_spreadsheet/spreadsheet_column.cc index 964738ff2c1..19fe61f0ed3 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_column.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_column.cc @@ -5,6 +5,7 @@ #include "MEM_guardedalloc.h" #include "BLI_color.hh" +#include "BLI_cpp_type.hh" #include "BLI_hash.hh" #include "BLI_math_vec_types.hh" #include "BLI_string.h" @@ -12,14 +13,12 @@ #include "BKE_geometry_set.hh" -#include "FN_cpp_type.hh" - #include "spreadsheet_column.hh" #include "spreadsheet_column_values.hh" namespace blender::ed::spreadsheet { -eSpreadsheetColumnValueType cpp_type_to_column_type(const fn::CPPType &type) +eSpreadsheetColumnValueType cpp_type_to_column_type(const CPPType &type) { if (type.is()) { return SPREADSHEET_VALUE_TYPE_BOOL; diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_column_values.hh b/source/blender/editors/space_spreadsheet/spreadsheet_column_values.hh index 454518016bc..f4d07255e2d 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_column_values.hh +++ b/source/blender/editors/space_spreadsheet/spreadsheet_column_values.hh @@ -12,7 +12,7 @@ namespace blender::ed::spreadsheet { struct CellDrawParams; -eSpreadsheetColumnValueType cpp_type_to_column_type(const fn::CPPType &type); +eSpreadsheetColumnValueType cpp_type_to_column_type(const CPPType &type); /** * This represents a column in a spreadsheet. It has a name and provides a value for all the cells -- cgit v1.2.3