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

---
 .../ociogradingtransformlinear/ociogradingtransformlinear.cpp   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.cpp b/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.cpp
index f20012b47..6bb640d7f 100644
--- a/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.cpp
+++ b/app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.cpp
@@ -68,7 +68,7 @@ OCIOGradingTransformLinearNode::OCIOGradingTransformLinearNode()
   SetInputProperty(kClampBlackInput, QStringLiteral("disable"), GetStandardValue(kClampBlackDisableInput).toBool());
   SetInputProperty(kClampBlackInput, QStringLiteral("base"), 0.01);
 
-  AddInput(kClampBlackDisableInput, NodeValue::kBoolean, false);
+  AddInput(kClampWhiteDisableInput, NodeValue::kBoolean, false);
 
   AddInput(kClampWhiteInput, NodeValue::kFloat, 1.0);
   SetInputProperty(kClampWhiteInput, QStringLiteral("disable"), GetStandardValue(kClampWhiteDisableInput).toBool());