From accdbe8dfb4d4715a8b75a4600dec2c7c4db3d63 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 8 May 2022 11:50:40 -0700 Subject: [PATCH] ociogradingtransformlinear: disable limits Unfortunately I realized these will break if the input they are using are keyframed or connected in any way. At some point we may implement something to get around that, but currently there is nothing so they are temporarily disabled --- .../ociogradingtransformlinear.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.cpp b/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.cpp index 72674af85..7a8bc1c74 100644 --- a/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.cpp +++ b/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.cpp @@ -75,7 +75,11 @@ OCIOGradingTransformLinearNode::OCIOGradingTransformLinearNode() AddInput(kClampWhiteInput, NodeValue::kFloat, 1.0); SetInputProperty(kClampWhiteInput, QStringLiteral("enabled"), GetStandardValue(kClampWhiteEnableInput).toBool()); SetInputProperty(kClampWhiteInput, QStringLiteral("base"), 0.01); - SetInputProperty(kClampWhiteInput, QStringLiteral("min"), GetStandardValue(kClampBlackInput).toDouble() + 0.000001); + + // FIXME: Temporarily disabled. This will break if "clamp black" is keyframed or connected to + // something and there's currently no solution to remedy that. If there is in the future, + // we can look into re-enabling this. + //SetInputProperty(kClampWhiteInput, QStringLiteral("min"), GetStandardValue(kClampBlackInput).toDouble() + 0.000001); } QString OCIOGradingTransformLinearNode::Name() const @@ -118,15 +122,17 @@ void OCIOGradingTransformLinearNode::Retranslate() void OCIOGradingTransformLinearNode::InputValueChangedEvent(const QString &input, int element) { Q_UNUSED(element); + if (input == kClampWhiteEnableInput) { SetInputProperty(kClampWhiteInput, QStringLiteral("enabled"), GetStandardValue(kClampWhiteEnableInput).toBool()); - } - if (input == kClampBlackEnableInput) { + } else if (input == kClampBlackEnableInput) { SetInputProperty(kClampBlackInput, QStringLiteral("enabled"), GetStandardValue(kClampBlackEnableInput).toBool()); - } - if (input == kClampBlackInput) { + } else if (input == kClampBlackInput) { // Ensure the white clamp is always greater than the black clamp as per OCIO::GradingPrimary::validate - SetInputProperty(kClampWhiteInput, QStringLiteral("min"), GetStandardValue(kClampBlackInput).toDouble() + 0.000001); + // FIXME: Temporarily disabled. This will break if "clamp black" is keyframed or connected to + // something and there's currently no solution to remedy that. If there is in the future, + // we can look into re-enabling this. + //SetInputProperty(kClampWhiteInput, QStringLiteral("min"), GetStandardValue(kClampBlackInput).toDouble() + 0.000001); } GenerateProcessor();