[Bf-blender-cvs] [754a663f681] master: Cleanup: remove some private fields that are currently unused

[Jacques Lucke]

Commit: 754a663f6812e504585b07831e7dbc5a7505eced
Author: Jacques Lucke
Date:   Wed Aug 5 14:59:06 2020 +0200
Branches: master
https://developer.blender.org/rB754a663f6812e504585b07831e7dbc5a7505eced

Cleanup: remove some private fields that are currently unused

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

M       source/blender/nodes/NOD_derived_node_tree.hh
M       source/blender/nodes/NOD_node_tree_multi_function.hh
M       source/blender/nodes/intern/derived_node_tree.cc

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

diff --git a/source/blender/nodes/NOD_derived_node_tree.hh 
b/source/blender/nodes/NOD_derived_node_tree.hh
index b39c9fd1a23..3ae209fbf25 100644
--- a/source/blender/nodes/NOD_derived_node_tree.hh
+++ b/source/blender/nodes/NOD_derived_node_tree.hh
@@ -172,7 +172,6 @@ using NodeTreeRefMap = Map<bNodeTree *, 
std::unique_ptr<const NodeTreeRef>>;
 class DerivedNodeTree : NonCopyable, NonMovable {
  private:
   LinearAllocator<> allocator_;
-  bNodeTree *btree_;
   Vector<DNode *> nodes_by_id_;
   Vector<DGroupInput *> group_inputs_;
   Vector<DParentNode *> parent_nodes_;
diff --git a/source/blender/nodes/NOD_node_tree_multi_function.hh 
b/source/blender/nodes/NOD_node_tree_multi_function.hh
index 81b467eca3a..815252bf97f 100644
--- a/source/blender/nodes/NOD_node_tree_multi_function.hh
+++ b/source/blender/nodes/NOD_node_tree_multi_function.hh
@@ -251,19 +251,17 @@ class MFNetworkBuilderBase {
  */
 class SocketMFNetworkBuilder : public MFNetworkBuilderBase {
  private:
-  const DSocket *dsocket_ = nullptr;
-  const DGroupInput *group_input_ = nullptr;
   bNodeSocket *bsocket_;
   fn::MFOutputSocket *built_socket_ = nullptr;
 
  public:
   SocketMFNetworkBuilder(CommonMFNetworkBuilderData &common, const DSocket 
&dsocket)
-      : MFNetworkBuilderBase(common), dsocket_(&dsocket), 
bsocket_(dsocket.bsocket())
+      : MFNetworkBuilderBase(common), bsocket_(dsocket.bsocket())
   {
   }
 
   SocketMFNetworkBuilder(CommonMFNetworkBuilderData &common, const DGroupInput 
&group_input)
-      : MFNetworkBuilderBase(common), group_input_(&group_input), 
bsocket_(group_input.bsocket())
+      : MFNetworkBuilderBase(common), bsocket_(group_input.bsocket())
   {
   }
 
diff --git a/source/blender/nodes/intern/derived_node_tree.cc 
b/source/blender/nodes/intern/derived_node_tree.cc
index 5414ea9208a..bcef8c33a3b 100644
--- a/source/blender/nodes/intern/derived_node_tree.cc
+++ b/source/blender/nodes/intern/derived_node_tree.cc
@@ -28,7 +28,7 @@ static const NodeTreeRef &get_tree_ref(NodeTreeRefMap 
&node_tree_refs, bNodeTree
                                           [&]() { return 
std::make_unique<NodeTreeRef>(btree); });
 }
 
-DerivedNodeTree::DerivedNodeTree(bNodeTree *btree, NodeTreeRefMap 
&node_tree_refs) : btree_(btree)
+DerivedNodeTree::DerivedNodeTree(bNodeTree *btree, NodeTreeRefMap 
&node_tree_refs)
 {
   const NodeTreeRef &main_tree_ref = get_tree_ref(node_tree_refs, btree);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs