Merge branch 'master' into nodeview-redux

2021-06-16 17:20:05 -07:00
parent e8a326aed9 401d69954c
commit 6d2ffb1bc4
23 changed files with 8608 additions and 5122 deletions
@@ -87,7 +87,11 @@ void ImportTool::DragEnter(TimelineViewMouseEvent *event)
    PrepGhosts(drag_start_.GetFrame() - parent()->SceneToTime(import_pre_buffer_),
               drag_start_.GetTrack().index());

-    event->accept();
+    if (parent()->HasGhosts() || !parent()->GetConnectedNode()) {
+      event->accept();
+    } else {
+      event->ignore();
+    }
  } else {
    // FIXME: Implement dropping from file
    event->ignore();