From ceffff3f824ae1c5a493de13df215ab4529d74c7 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Sat, 7 May 2022 12:36:06 -0700
Subject: [PATCH] ociogradingtransformlinear: fix potential merge conflict

---
 .../ociogradingtransformlinear/ociogradingtransformlinear.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.cpp b/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.cpp
index 1d648d6b7..f20012b47 100644
--- a/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.cpp
+++ b/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.cpp
@@ -62,13 +62,13 @@ OCIOGradingTransformLinearNode::OCIOGradingTransformLinearNode()
   AddInput(kPivotInput, NodeValue::kFloat, 0.18); // Default listed in OCIO::GradingPrimary
   SetInputProperty(kPivotInput, QStringLiteral("base"), 0.01);
 
-  AddInput(kClampBlackEnableInput, NodeValue::kBoolean, false);
+  AddInput(kClampBlackDisableInput, NodeValue::kBoolean, false);
 
   AddInput(kClampBlackInput, NodeValue::kFloat, 0.0);
   SetInputProperty(kClampBlackInput, QStringLiteral("disable"), GetStandardValue(kClampBlackDisableInput).toBool());
   SetInputProperty(kClampBlackInput, QStringLiteral("base"), 0.01);
 
-  AddInput(kClampWhiteEnableInput, NodeValue::kBoolean, false);
+  AddInput(kClampBlackDisableInput, NodeValue::kBoolean, false);
 
   AddInput(kClampWhiteInput, NodeValue::kFloat, 1.0);
   SetInputProperty(kClampWhiteInput, QStringLiteral("disable"), GetStandardValue(kClampWhiteDisableInput).toBool());