From e08f2f9c34bba95ae8597d3060654db33c2a1183 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue, 7 Sep 2021 23:16:46 -0700 Subject: [PATCH] more missing lines --- app/node/block/transition/transition.cpp | 5 +++-- app/node/distort/transform/transformdistortnode.cpp | 2 +- app/node/math/merge/merge.cpp | 2 +- app/widget/nodeparamview/nodeparamviewconnectedlabel.h | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/node/block/transition/transition.cpp b/app/node/block/transition/transition.cpp index 7b89294fd..d83c80a66 100644 --- a/app/node/block/transition/transition.cpp +++ b/app/node/block/transition/transition.cpp @@ -139,8 +139,9 @@ double TransitionBlock::GetInProgress(const double &time) const void TransitionBlock::Hash(const ValueHint &output, QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams &video_params) const { - if (HashPassthrough(kInBlockInput, output, hash, globals, video_params) || HashPassthrough(kOutBlockInput, output, hash, globals, video_params)) { - HashAddNodeSignature(hash); + if (HashPassthrough(kInBlockInput, GetValueHintForInput(kInBlockInput, -1), hash, globals, video_params) + || HashPassthrough(kOutBlockInput, GetValueHintForInput(kOutBlockInput, -1), hash, globals, video_params)) { + HashAddNodeSignature(hash, output); double time_dbl = globals.time().in().toDouble(); double all_prog = GetTotalProgress(time_dbl); diff --git a/app/node/distort/transform/transformdistortnode.cpp b/app/node/distort/transform/transformdistortnode.cpp index 2e901d68a..f6945f001 100644 --- a/app/node/distort/transform/transformdistortnode.cpp +++ b/app/node/distort/transform/transformdistortnode.cpp @@ -328,7 +328,7 @@ void TransformDistortNode::Hash(const ValueHint &output, QCryptographicHash &has if (!matrix.isIdentity()) { // Add fingerprint - HashAddNodeSignature(hash); + HashAddNodeSignature(hash, output); hash.addData(reinterpret_cast(&matrix), sizeof(matrix)); } } diff --git a/app/node/math/merge/merge.cpp b/app/node/math/merge/merge.cpp index b2732e88d..2f14cbed2 100644 --- a/app/node/math/merge/merge.cpp +++ b/app/node/math/merge/merge.cpp @@ -116,7 +116,7 @@ void MergeNode::Hash(const ValueHint &output, QCryptographicHash &hash, const No if (!passthrough_base && !passthrough_blend) { // This merge will actually do something so we add a fingerprint - HashAddNodeSignature(hash); + HashAddNodeSignature(hash, output); } if (!passthrough_base) { diff --git a/app/widget/nodeparamview/nodeparamviewconnectedlabel.h b/app/widget/nodeparamview/nodeparamviewconnectedlabel.h index 8ff3f8f3f..5f6a2ea06 100644 --- a/app/widget/nodeparamview/nodeparamviewconnectedlabel.h +++ b/app/widget/nodeparamview/nodeparamviewconnectedlabel.h @@ -50,7 +50,7 @@ private: NodeInput input_; - NodeOutput connected_node_; + Node *connected_node_; };