[Bf-blender-cvs] [0a667c66142] functions: cleanup

Jacques Lucke noreply at git.blender.org
Tue Nov 26 17:32:09 CET 2019


Commit: 0a667c661423f5025e5bd4e5c21858d02049fd84
Author: Jacques Lucke
Date:   Tue Nov 26 17:12:06 2019 +0100
Branches: functions
https://developer.blender.org/rB0a667c661423f5025e5bd4e5c21858d02049fd84

cleanup

===================================================================

M	source/blender/blenkernel/intern/inlined_node_tree.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/inlined_node_tree.cc b/source/blender/blenkernel/intern/inlined_node_tree.cc
index 68008b7f645..41f9e3ef3c1 100644
--- a/source/blender/blenkernel/intern/inlined_node_tree.cc
+++ b/source/blender/blenkernel/intern/inlined_node_tree.cc
@@ -92,6 +92,17 @@ InlinedNodeTree::~InlinedNodeTree()
   }
 }
 
+void XNode::destruct_with_sockets()
+{
+  for (XInputSocket *socket : m_inputs) {
+    socket->~XInputSocket();
+  }
+  for (XOutputSocket *socket : m_outputs) {
+    socket->~XOutputSocket();
+  }
+  this->~XNode();
+}
+
 InlinedNodeTree::InlinedNodeTree(bNodeTree *btree, BTreeVTreeMap &vtrees) : m_btree(btree)
 {
   SCOPED_TIMER(__func__);
@@ -121,17 +132,6 @@ BLI_NOINLINE void InlinedNodeTree::expand_groups(Vector<XNode *> &all_nodes,
   }
 }
 
-void XNode::destruct_with_sockets()
-{
-  for (XInputSocket *socket : m_inputs) {
-    socket->~XInputSocket();
-  }
-  for (XOutputSocket *socket : m_outputs) {
-    socket->~XOutputSocket();
-  }
-  this->~XNode();
-}
-
 void InlinedNodeTree::expand_group_node(XNode &group_node,
                                         Vector<XNode *> &all_nodes,
                                         Vector<XGroupInput *> &all_group_inputs,



More information about the Bf-blender-cvs mailing list