Fix #1484

MrKepzie · Nov 11, 2016 · 556e4e2 · 556e4e2
1 parent 3841b52
commit 556e4e2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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;