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/functions/intern/cpp_types.cc | 29 ++++------------------------ 1 file changed, 4 insertions(+), 25 deletions(-) (limited to 'source/blender/functions/intern/cpp_types.cc') diff --git a/source/blender/functions/intern/cpp_types.cc b/source/blender/functions/intern/cpp_types.cc index 5606f660237..a2adc2ea8b6 100644 --- a/source/blender/functions/intern/cpp_types.cc +++ b/source/blender/functions/intern/cpp_types.cc @@ -1,38 +1,17 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ -#include "FN_cpp_type_make.hh" -#include "FN_field_cpp_type.hh" - #include "BLI_color.hh" +#include "BLI_cpp_type_make.hh" #include "BLI_float4x4.hh" #include "BLI_math_vec_types.hh" -namespace blender::fn { - -MAKE_CPP_TYPE(bool, bool, CPPTypeFlags::BasicType) - -MAKE_CPP_TYPE(float, float, CPPTypeFlags::BasicType) -MAKE_CPP_TYPE(float2, blender::float2, CPPTypeFlags::BasicType) -MAKE_CPP_TYPE(float3, blender::float3, CPPTypeFlags::BasicType) -MAKE_CPP_TYPE(float4x4, blender::float4x4, CPPTypeFlags::BasicType) - -MAKE_CPP_TYPE(int32, int32_t, CPPTypeFlags::BasicType) -MAKE_CPP_TYPE(int8, int8_t, CPPTypeFlags::BasicType) -MAKE_CPP_TYPE(uint32, uint32_t, CPPTypeFlags::BasicType) -MAKE_CPP_TYPE(uint8, uint8_t, CPPTypeFlags::BasicType) - -MAKE_CPP_TYPE(ColorGeometry4f, blender::ColorGeometry4f, CPPTypeFlags::BasicType) -MAKE_CPP_TYPE(ColorGeometry4b, blender::ColorGeometry4b, CPPTypeFlags::BasicType) - -MAKE_CPP_TYPE(string, std::string, CPPTypeFlags::BasicType) +#include "FN_field_cpp_type.hh" MAKE_FIELD_CPP_TYPE(FloatField, float); -MAKE_FIELD_CPP_TYPE(Float2Field, float2); -MAKE_FIELD_CPP_TYPE(Float3Field, float3); +MAKE_FIELD_CPP_TYPE(Float2Field, blender::float2); +MAKE_FIELD_CPP_TYPE(Float3Field, blender::float3); MAKE_FIELD_CPP_TYPE(ColorGeometry4fField, blender::ColorGeometry4f); MAKE_FIELD_CPP_TYPE(BoolField, bool); MAKE_FIELD_CPP_TYPE(Int8Field, int8_t); MAKE_FIELD_CPP_TYPE(Int32Field, int32_t); MAKE_FIELD_CPP_TYPE(StringField, std::string); - -} // namespace blender::fn -- cgit v1.2.3