fixed merge connection issue

2021-02-21 10:14:55 +11:00
parent 332c120c1f
commit e0443e017c
1 changed files with 1 additions and 1 deletions
@@ -1405,7 +1405,7 @@ public:
        const NodeInput& i = ic.second;

        // Ignore the track input, but funnel everything else through our merge
-        if (i.node() != timeline_->parent() && i.input() != timeline_->track_input()) {
+        if (i.node() != timeline_->parent() || i.input() != timeline_->track_input()) {
          Node::DisconnectEdge(last_track, i);
          Node::ConnectEdge(merge_, i);
        }