diff options
author | Jacques Lucke <jacques@blender.org> | 2021-03-07 16:46:48 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-03-07 16:46:48 +0300 |
commit | e72dc1e6c69ef22dbec8c6c17d7a4e309d362e9e (patch) | |
tree | bdf07d36734e67da1acdd8fb44e530af7f65df44 | |
parent | c14770370f0f5906c479bb444f70a26733efade9 (diff) |
Cleanup: compiler warnings
-rw-r--r-- | source/blender/functions/intern/multi_function_network.cc | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_nodes.cc | 2 | ||||
-rw-r--r-- | source/blender/nodes/intern/node_tree_ref.cc | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/functions/intern/multi_function_network.cc b/source/blender/functions/intern/multi_function_network.cc index 77c8ba6373f..b5c2c09a35a 100644 --- a/source/blender/functions/intern/multi_function_network.cc +++ b/source/blender/functions/intern/multi_function_network.cc @@ -70,7 +70,7 @@ MFFunctionNode &MFNetwork::add_function(const MultiFunction &function) } } - MFFunctionNode &node = *allocator_.construct<MFFunctionNode>(); + MFFunctionNode &node = *allocator_.construct<MFFunctionNode>().release(); function_nodes_.add_new(&node); node.network_ = this; @@ -129,7 +129,7 @@ MFDummyNode &MFNetwork::add_dummy(StringRef name, assert_same_size(input_types, input_names); assert_same_size(output_types, output_names); - MFDummyNode &node = *allocator_.construct<MFDummyNode>(); + MFDummyNode &node = *allocator_.construct<MFDummyNode>().release(); dummy_nodes_.add_new(&node); node.network_ = this; diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index 50c07578173..c0c7897413b 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -307,7 +307,7 @@ class GeometryNodesEvaluator { /* Multi-input sockets contain a vector of inputs. */ if (socket_to_compute->is_multi_input_socket()) { Vector<GMutablePointer> values; - for (const DSocket from_socket : from_sockets) { + for (const DSocket &from_socket : from_sockets) { GMutablePointer value = get_input_from_incoming_link(socket_to_compute, from_socket); values.append(value); } diff --git a/source/blender/nodes/intern/node_tree_ref.cc b/source/blender/nodes/intern/node_tree_ref.cc index 7fe21ec8582..0ea2538d6f1 100644 --- a/source/blender/nodes/intern/node_tree_ref.cc +++ b/source/blender/nodes/intern/node_tree_ref.cc @@ -25,7 +25,7 @@ NodeTreeRef::NodeTreeRef(bNodeTree *btree) : btree_(btree) Map<bNode *, NodeRef *> node_mapping; LISTBASE_FOREACH (bNode *, bnode, &btree->nodes) { - NodeRef &node = *allocator_.construct<NodeRef>(); + NodeRef &node = *allocator_.construct<NodeRef>().release(); node.tree_ = this; node.bnode_ = bnode; @@ -33,7 +33,7 @@ NodeTreeRef::NodeTreeRef(bNodeTree *btree) : btree_(btree) RNA_pointer_create(&btree->id, &RNA_Node, bnode, &node.rna_); LISTBASE_FOREACH (bNodeSocket *, bsocket, &bnode->inputs) { - InputSocketRef &socket = *allocator_.construct<InputSocketRef>(); + InputSocketRef &socket = *allocator_.construct<InputSocketRef>().release(); socket.node_ = &node; socket.index_ = node.inputs_.append_and_get_index(&socket); socket.is_input_ = true; @@ -43,7 +43,7 @@ NodeTreeRef::NodeTreeRef(bNodeTree *btree) : btree_(btree) } LISTBASE_FOREACH (bNodeSocket *, bsocket, &bnode->outputs) { - OutputSocketRef &socket = *allocator_.construct<OutputSocketRef>(); + OutputSocketRef &socket = *allocator_.construct<OutputSocketRef>().release(); socket.node_ = &node; socket.index_ = node.outputs_.append_and_get_index(&socket); socket.is_input_ = false; @@ -53,7 +53,7 @@ NodeTreeRef::NodeTreeRef(bNodeTree *btree) : btree_(btree) } LISTBASE_FOREACH (bNodeLink *, blink, &bnode->internal_links) { - InternalLinkRef &internal_link = *allocator_.construct<InternalLinkRef>(); + InternalLinkRef &internal_link = *allocator_.construct<InternalLinkRef>().release(); internal_link.blink_ = blink; for (InputSocketRef *socket_ref : node.inputs_) { if (socket_ref->bsocket_ == blink->fromsock) { @@ -82,7 +82,7 @@ NodeTreeRef::NodeTreeRef(bNodeTree *btree) : btree_(btree) InputSocketRef &to_socket = this->find_input_socket( node_mapping, blink->tonode, blink->tosock); - LinkRef &link = *allocator_.construct<LinkRef>(); + LinkRef &link = *allocator_.construct<LinkRef>().release(); link.from_ = &from_socket; link.to_ = &to_socket; link.blink_ = blink; |