[Bf-blender-cvs] [7bae599232a] master: Nodes: add redundant name check in debug builds to prevent errors
Jacques Lucke
noreply at git.blender.org
Fri Jul 10 14:23:50 CEST 2020
Commit: 7bae599232ab5d00a0b7a9e310741df6fbea204f
Author: Jacques Lucke
Date: Fri Jul 10 14:18:51 2020 +0200
Branches: master
https://developer.blender.org/rB7bae599232ab5d00a0b7a9e310741df6fbea204f
Nodes: add redundant name check in debug builds to prevent errors
===================================================================
M source/blender/blenkernel/BKE_derived_node_tree.hh
===================================================================
diff --git a/source/blender/blenkernel/BKE_derived_node_tree.hh b/source/blender/blenkernel/BKE_derived_node_tree.hh
index 3790d06a534..083057835a5 100644
--- a/source/blender/blenkernel/BKE_derived_node_tree.hh
+++ b/source/blender/blenkernel/BKE_derived_node_tree.hh
@@ -140,6 +140,9 @@ class DNode : NonCopyable, NonMovable {
const DInputSocket &input(uint index) const;
const DOutputSocket &output(uint index) const;
+ const DInputSocket &input(uint index, StringRef expected_name) const;
+ const DOutputSocket &output(uint index, StringRef expected_name) const;
+
uint id() const;
PointerRNA *rna() const;
@@ -408,6 +411,22 @@ inline const DOutputSocket &DNode::output(uint index) const
return *outputs_[index];
}
+inline const DInputSocket &DNode::input(uint index, StringRef expected_name) const
+{
+ const DInputSocket &socket = *inputs_[index];
+ BLI_assert(socket.name() == expected_name);
+ UNUSED_VARS_NDEBUG(expected_name);
+ return socket;
+}
+
+inline const DOutputSocket &DNode::output(uint index, StringRef expected_name) const
+{
+ const DOutputSocket &socket = *outputs_[index];
+ BLI_assert(socket.name() == expected_name);
+ UNUSED_VARS_NDEBUG(expected_name);
+ return socket;
+}
+
inline uint DNode::id() const
{
return id_;
More information about the Bf-blender-cvs
mailing list