Merge branch 'master' into ui-optimizations

2020-10-05 15:19:57 +11:00
parent ab6501d215 ac4be0907f
commit 787ea1d548
24 changed files with 334 additions and 15 deletions
@@ -27,6 +27,7 @@
 #include "node/node.h"
 #include "nodeviewitem.h"
 #include "undo/undocommand.h"
+#include "widget/timelinewidget/undo/undo.h"

 OLIVE_NAMESPACE_ENTER

@@ -112,6 +113,7 @@ private:
  NodeGraph* graph_;
  QList<Node*> nodes_;
  QList<NodeEdgePtr> edges_;
+  QList<BlockUnlinkAllCommand*> block_unlink_commands_;
 };

 class NodeRemoveWithExclusiveDeps : public UndoCommand {