[Bf-blender-cvs] [31ecaf4a8ab] functions-experimental-refactor: make MultiFunction const in more places

Jacques Lucke noreply at git.blender.org
Fri Oct 18 17:53:45 CEST 2019


Commit: 31ecaf4a8ab60549b3c772131c50c5c07451136a
Author: Jacques Lucke
Date:   Fri Oct 18 17:49:12 2019 +0200
Branches: functions-experimental-refactor
https://developer.blender.org/rB31ecaf4a8ab60549b3c772131c50c5c07451136a

make MultiFunction const in more places

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

M	source/blender/blenkernel/BKE_multi_function_network.h
M	source/blender/blenkernel/intern/multi_function_network.cc

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

diff --git a/source/blender/blenkernel/BKE_multi_function_network.h b/source/blender/blenkernel/BKE_multi_function_network.h
index 3f174b3d723..b94f1815282 100644
--- a/source/blender/blenkernel/BKE_multi_function_network.h
+++ b/source/blender/blenkernel/BKE_multi_function_network.h
@@ -51,14 +51,14 @@ class MFBuilderNode : BLI::NonCopyable, BLI::NonMovable {
 
 class MFBuilderFunctionNode : public MFBuilderNode {
  private:
-  MultiFunction *m_function;
+  const MultiFunction *m_function;
   Vector<uint> m_input_param_indices;
   Vector<uint> m_output_param_indices;
 
   friend MFNetworkBuilder;
 
  public:
-  MultiFunction &function();
+  const MultiFunction &function();
 
   ArrayRef<uint> input_param_indices();
   ArrayRef<uint> output_param_indices();
@@ -124,7 +124,7 @@ class MFNetworkBuilder : BLI::NonCopyable, BLI::NonMovable {
  public:
   ~MFNetworkBuilder();
 
-  MFBuilderFunctionNode &add_function(MultiFunction &function,
+  MFBuilderFunctionNode &add_function(const MultiFunction &function,
                                       ArrayRef<uint> input_param_indices,
                                       ArrayRef<uint> output_param_indices);
   MFBuilderPlaceholderNode &add_placeholder(ArrayRef<MFDataType> input_types,
@@ -202,14 +202,14 @@ class MFNode : BLI::NonCopyable, BLI::NonMovable {
 
 class MFFunctionNode : public MFNode {
  private:
-  MultiFunction *m_function;
+  const MultiFunction *m_function;
   Vector<uint> m_input_param_indices;
   Vector<uint> m_output_param_indices;
 
   friend MFNetwork;
 
  public:
-  MultiFunction &function();
+  const MultiFunction &function();
 };
 
 class MFPlaceholderNode : public MFNode {
@@ -319,7 +319,7 @@ inline MFBuilderPlaceholderNode &MFBuilderNode::as_placeholder()
   return *(MFBuilderPlaceholderNode *)this;
 }
 
-inline MultiFunction &MFBuilderFunctionNode::function()
+inline const MultiFunction &MFBuilderFunctionNode::function()
 {
   return *m_function;
 }
@@ -429,7 +429,7 @@ inline MFPlaceholderNode &MFNode::as_placeholder()
   return *(MFPlaceholderNode *)this;
 }
 
-inline MultiFunction &MFFunctionNode::function()
+inline const MultiFunction &MFFunctionNode::function()
 {
   return *m_function;
 }
diff --git a/source/blender/blenkernel/intern/multi_function_network.cc b/source/blender/blenkernel/intern/multi_function_network.cc
index 03f10eb3547..26b4d5cf46a 100644
--- a/source/blender/blenkernel/intern/multi_function_network.cc
+++ b/source/blender/blenkernel/intern/multi_function_network.cc
@@ -21,7 +21,7 @@ MFNetworkBuilder::~MFNetworkBuilder()
   }
 }
 
-MFBuilderFunctionNode &MFNetworkBuilder::add_function(MultiFunction &function,
+MFBuilderFunctionNode &MFNetworkBuilder::add_function(const MultiFunction &function,
                                                       ArrayRef<uint> input_param_indices,
                                                       ArrayRef<uint> output_param_indices)
 {



More information about the Bf-blender-cvs mailing list