diff options
author | Jacques Lucke <jacques@blender.org> | 2021-08-17 15:00:06 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-08-17 15:00:06 +0300 |
commit | 635f73b7f1806b6c48b9799a950a98e5fea7f14e (patch) | |
tree | bd3cd74d317f0225f253ac489febdf5844fd07d6 /source | |
parent | 74fcd50e2f2c92343d9f9cba942d9b3c3e4ec683 (diff) |
fixes after merge
Diffstat (limited to 'source')
4 files changed, 6 insertions, 10 deletions
diff --git a/source/blender/functions/intern/multi_function_network_to_procedure.cc b/source/blender/functions/intern/multi_function_network_to_procedure.cc index 342f3bf2e49..3cb980acf1d 100644 --- a/source/blender/functions/intern/multi_function_network_to_procedure.cc +++ b/source/blender/functions/intern/multi_function_network_to_procedure.cc @@ -55,7 +55,7 @@ class CopyMultiFunction : public MultiFunction { BUFFER_FOR_CPP_TYPE_VALUE(type, buffer); for (int i : mask) { values_in.get_to_uninitialized(i, buffer); - type.copy_to_uninitialized(buffer, values_out[i]); + type.copy_construct(buffer, values_out[i]); type.destruct(buffer); } break; diff --git a/source/blender/nodes/NOD_node_tree_ref.hh b/source/blender/nodes/NOD_node_tree_ref.hh index 4b4e3031669..4f2565cbbaf 100644 --- a/source/blender/nodes/NOD_node_tree_ref.hh +++ b/source/blender/nodes/NOD_node_tree_ref.hh @@ -206,7 +206,6 @@ class NodeRef : NonCopyable, NonMovable { bool is_muted() const; bool is_frame() const; bool is_undefined() const; - bool is_undefined_or_has_undefined_sockets() const; void *storage() const; template<typename T> T *storage() const; diff --git a/source/blender/nodes/intern/node_tree_multi_function_procedure.cc b/source/blender/nodes/intern/node_tree_multi_function_procedure.cc index 48a83e3de8f..3bcc41f3d96 100644 --- a/source/blender/nodes/intern/node_tree_multi_function_procedure.cc +++ b/source/blender/nodes/intern/node_tree_multi_function_procedure.cc @@ -95,7 +95,7 @@ class NodeTreeProcedureBuilder { MFVariable &NodeMFProcedureBuilder::get_input(StringRef identifer) { const DInputSocket socket = node_.input_by_identifier(identifer); - const CPPType &cpp_type = *socket_cpp_type_get(*socket->typeinfo()); + const CPPType &cpp_type = *socket->typeinfo()->get_base_cpp_type(); const MFDataType data_type = MFDataType::ForSingle(cpp_type); return *procedure_builder_.variable_by_socket_.lookup_or_add_cb(socket, [&]() { return &this->procedure_builder_.procedure_->new_variable(data_type, socket->name()); diff --git a/source/blender/nodes/intern/node_tree_ref.cc b/source/blender/nodes/intern/node_tree_ref.cc index 726dd724d6d..641d02af902 100644 --- a/source/blender/nodes/intern/node_tree_ref.cc +++ b/source/blender/nodes/intern/node_tree_ref.cc @@ -458,17 +458,14 @@ bool NodeTreeRef::has_link_cycles() const return false; } -bool NodeRef::is_undefined_or_has_undefined_sockets() const +bool NodeTreeRef::has_undefined_nodes_or_sockets() const { - if (this->is_undefined()) { - return true; - } - for (const SocketRef *socket : inputs_) { - if (socket->is_undefined()) { + for (const NodeRef *node : nodes_by_id_) { + if (node->is_undefined()) { return true; } } - for (const SocketRef *socket : outputs_) { + for (const SocketRef *socket : sockets_by_id_) { if (socket->is_undefined()) { return true; } |