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/blenkernel/BKE_attribute_math.hh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'source/blender/blenkernel/BKE_attribute_math.hh') diff --git a/source/blender/blenkernel/BKE_attribute_math.hh b/source/blender/blenkernel/BKE_attribute_math.hh index 42bff89922b..9e97979fde9 100644 --- a/source/blender/blenkernel/BKE_attribute_math.hh +++ b/source/blender/blenkernel/BKE_attribute_math.hh @@ -4,17 +4,14 @@ #include "BLI_array.hh" #include "BLI_color.hh" +#include "BLI_cpp_type.hh" #include "BLI_math_vector.h" #include "BLI_math_vector.hh" #include "DNA_customdata_types.h" -#include "FN_cpp_type.hh" - namespace blender::attribute_math { -using fn::CPPType; - /** * Utility function that simplifies calling a templated function based on a custom data type. */ @@ -50,7 +47,7 @@ inline void convert_to_static_type(const CustomDataType data_type, const Func &f } template -inline void convert_to_static_type(const fn::CPPType &cpp_type, const Func &func) +inline void convert_to_static_type(const CPPType &cpp_type, const Func &func) { if (cpp_type.is()) { func(float()); -- cgit v1.2.3