From 556e4e236c37c576ea3736c0ae4fdab8f5428e94 Mon Sep 17 00:00:00 2001
From: Alexandre Gauthier <alexandre230@msn.com>
Date: Fri, 11 Nov 2016 15:26:22 +0100
Subject: [PATCH] Fix #1484

---
 Engine/Node.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Engine/Node.cpp b/Engine/Node.cpp
index f2c04a27f4..5185d6dbb7 100644
--- a/Engine/Node.cpp
+++ b/Engine/Node.cpp
@@ -2757,7 +2757,11 @@ Node::getPreferredInputInternal(bool connected) const
             }
         }
     }
-    bool useInputA = appPTR->getCurrentSettings()->isMergeAutoConnectingToAInput();
+    bool useInputA = false;
+    if (!connected) {
+        // For the merge node, use the preference (only when not connected)
+        useInputA = appPTR->getCurrentSettings()->isMergeAutoConnectingToAInput();
+    }
 
     ///Find an input named A
     int inputToFind = -1, foundOther = -1;