From 7d281a4f7d354d270fc9c9f3c7a65b4409362aa0 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Mon, 28 Jun 2021 13:13:52 +0200 Subject: Functions: improve CPPType * Reduce code duplication. * Give methods more standardized names (e.g. `move_to_initialized` -> `move_assign`). * Support wrapping arbitrary C++ types, even those that e.g. are not copyable. --- source/blender/nodes/intern/node_socket.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/nodes/intern/node_socket.cc') diff --git a/source/blender/nodes/intern/node_socket.cc b/source/blender/nodes/intern/node_socket.cc index d00bf636e15..9f0a145ace2 100644 --- a/source/blender/nodes/intern/node_socket.cc +++ b/source/blender/nodes/intern/node_socket.cc @@ -662,10 +662,10 @@ static bNodeSocketType *make_socket_type_string() return socktype; } -MAKE_CPP_TYPE(Object, Object *) -MAKE_CPP_TYPE(Collection, Collection *) -MAKE_CPP_TYPE(Texture, Tex *) -MAKE_CPP_TYPE(Material, Material *) +MAKE_CPP_TYPE(Object, Object *, CPPTypeFlags::BasicType) +MAKE_CPP_TYPE(Collection, Collection *, CPPTypeFlags::BasicType) +MAKE_CPP_TYPE(Texture, Tex *, CPPTypeFlags::BasicType) +MAKE_CPP_TYPE(Material, Material *, CPPTypeFlags::BasicType) static bNodeSocketType *make_socket_type_object() { -- cgit v1.2.3