Merge branch 'track-redux' into move-serialization

2023-02-23 11:09:45 -08:00
parent 028651f9fb aeac292ecb
commit 46d15396a6
35 changed files with 346 additions and 114 deletions
@@ -40,12 +40,12 @@
 #include "node/distort/transform/transformdistortnode.h"
 #include "node/generator/matrix/matrix.h"
 #include "node/math/math/math.h"
+#include "node/nodeundo.h"
 #include "node/project/folder/folder.h"
 #include "node/project/footage/footage.h"
 #include "node/project/sequence/sequence.h"
+#include "timeline/timelineundogeneral.h"
 #include "window/mainwindow/mainwindowundo.h"
-#include "widget/nodeview/nodeviewundo.h"
-#include "widget/timelinewidget/undo/timelineundogeneral.h"

 namespace olive {

@@ -24,7 +24,7 @@
 #ifdef USE_OTIO

 #include "common/otioutils.h"
-#include "node/project/project.h"
+#include "node/project.h"
 #include "task/project/load/loadbasetask.h"

 namespace olive {
@@ -27,7 +27,7 @@
 #include <opentimelineio/track.h>

 #include "common/otioutils.h"
-#include "node/project/project.h"
+#include "node/project.h"
 #include "task/task.h"

 namespace olive {