From 42d744d62402867cc7fddfb1a294458abffd3a5c Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 22 Jan 2022 17:15:56 -0800 Subject: [PATCH] group: or original flags with additional flags --- app/node/group/group.cpp | 4 ++-- app/node/group/group.h | 2 +- app/node/param.h | 13 +++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/node/group/group.cpp b/app/node/group/group.cpp index 970a896fe..3c049ddde 100644 --- a/app/node/group/group.cpp +++ b/app/node/group/group.cpp @@ -58,7 +58,7 @@ void NodeGroup::Retranslate() } } -QString NodeGroup::AddInputPassthrough(const NodeInput &input) +QString NodeGroup::AddInputPassthrough(const NodeInput &input, const InputFlags &flags) { Q_ASSERT(ContextContainsNode(input.node())); @@ -72,7 +72,7 @@ QString NodeGroup::AddInputPassthrough(const NodeInput &input) // Add input QString id = GetGroupInputIDFromInput(input); - AddInput(id, input.GetDataType(), input.GetDefaultValue(), input.GetFlags()); + AddInput(id, input.GetDataType(), input.GetDefaultValue(), input.GetFlags() | flags); input_passthroughs_.insert(id, input); diff --git a/app/node/group/group.h b/app/node/group/group.h index cccfe36b7..11e69b613 100644 --- a/app/node/group/group.h +++ b/app/node/group/group.h @@ -41,7 +41,7 @@ public: virtual void Retranslate() override; - QString AddInputPassthrough(const NodeInput &input); + QString AddInputPassthrough(const NodeInput &input, const InputFlags &flags = InputFlags()); void RemoveInputPassthrough(const NodeInput &input); diff --git a/app/node/param.h b/app/node/param.h index 77f8e63f6..e06ba0a9b 100644 --- a/app/node/param.h +++ b/app/node/param.h @@ -57,6 +57,19 @@ public: return f_ & f; } + InputFlags operator|(const InputFlags &f) const + { + InputFlags i = *this; + i |= f; + return i; + } + + InputFlags &operator|=(const InputFlags &f) + { + f_ |= f.f_; + return *this; + } + private: uint64_t f_;