Skip to content

Commit

Permalink
inputflag: rename IgnoreConnections to IgnoreInvalidations
Browse files Browse the repository at this point in the history
  • Loading branch information
itsmattkc committed Feb 21, 2023
1 parent f9cd28a commit 5891b70
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions app/node/node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ void Node::ConnectEdge(Node *output, const NodeInput &input)
emit output->OutputConnected(output, input);

// Invalidate all if this node isn't ignoring this input
if (!(input.node()->GetInputFlags(input.input()) & kInputFlagIgnoreConnections)) {
if (!(input.node()->GetInputFlags(input.input()) & kInputFlagIgnoreInvalidations)) {
input.node()->InvalidateAll(input.input(), input.element());
}
}
Expand All @@ -230,7 +230,7 @@ void Node::DisconnectEdge(Node *output, const NodeInput &input)
emit input.node()->InputDisconnected(output, input);
emit output->OutputDisconnected(output, input);

if (!(input.node()->GetInputFlags(input.input()) & kInputFlagIgnoreConnections)) {
if (!(input.node()->GetInputFlags(input.input()) & kInputFlagIgnoreInvalidations)) {
input.node()->InvalidateAll(input.input(), input.element());
}
}
Expand Down Expand Up @@ -1643,7 +1643,7 @@ void Node::ParameterValueChanged(const QString& input, int element, const TimeRa

emit ValueChanged(NodeInput(this, input, element), range);

if (GetInputFlags(input) & kInputFlagIgnoreConnections) {
if (GetInputFlags(input) & kInputFlagIgnoreInvalidations) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion app/node/output/track/track.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Track::Track() :
locked_(false),
sequence_(nullptr)
{
AddInput(kBlockInput, NodeValue::kNone, InputFlags(kInputFlagArray | kInputFlagNotKeyframable | kInputFlagHidden | kInputFlagIgnoreConnections));
AddInput(kBlockInput, NodeValue::kNone, InputFlags(kInputFlagArray | kInputFlagNotKeyframable | kInputFlagHidden | kInputFlagIgnoreInvalidations));

AddInput(kMutedInput, NodeValue::kBoolean, false, InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable));

Expand Down
2 changes: 1 addition & 1 deletion app/node/param.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ enum InputFlag : uint64_t {
kInputFlagNotKeyframable = 0x2,
kInputFlagNotConnectable = 0x4,
kInputFlagHidden = 0x8,
kInputFlagIgnoreConnections = 0x10,
kInputFlagIgnoreInvalidations = 0x10,

kInputFlagStatic = kInputFlagNotKeyframable | kInputFlagNotConnectable
};
Expand Down
2 changes: 1 addition & 1 deletion app/node/project/sequence/sequence.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Sequence::Sequence()
// Create track input
QString track_input_id = kTrackInputFormat.arg(i);

AddInput(track_input_id, NodeValue::kNone, InputFlags(kInputFlagNotKeyframable | kInputFlagArray | kInputFlagHidden | kInputFlagIgnoreConnections));
AddInput(track_input_id, NodeValue::kNone, InputFlags(kInputFlagNotKeyframable | kInputFlagArray | kInputFlagHidden | kInputFlagIgnoreInvalidations));

TrackList* list = new TrackList(this, static_cast<Track::Type>(i), track_input_id);
track_lists_.replace(i, list);
Expand Down

0 comments on commit 5891b70

Please sign in to comment.