Merge branch 'master' into track-redux

app/node/node.cpp

@@ -203,7 +203,7 @@ void Node::ConnectEdge(Node *output, const NodeInput &input)
   emit output->OutputConnected(output, input);
 
   // Invalidate all if this node isn't ignoring this input
-  if (!(input.node()->GetInputFlags(input.input()) & kInputFlagIgnoreConnections)) {
+  if (!(input.node()->GetInputFlags(input.input()) & kInputFlagIgnoreInvalidations)) {
     input.node()->InvalidateAll(input.input(), input.element());
   }
 }
@@ -230,7 +230,7 @@ void Node::DisconnectEdge(Node *output, const NodeInput &input)
   emit input.node()->InputDisconnected(output, input);
   emit output->OutputDisconnected(output, input);
 
-  if (!(input.node()->GetInputFlags(input.input()) & kInputFlagIgnoreConnections)) {
+  if (!(input.node()->GetInputFlags(input.input()) & kInputFlagIgnoreInvalidations)) {
     input.node()->InvalidateAll(input.input(), input.element());
   }
 }
@@ -1643,7 +1643,7 @@ void Node::ParameterValueChanged(const QString& input, int element, const TimeRa
 
   emit ValueChanged(NodeInput(this, input, element), range);
 
-  if (GetInputFlags(input) & kInputFlagIgnoreConnections) {
+  if (GetInputFlags(input) & kInputFlagIgnoreInvalidations) {
     return;
   }
 

app/node/output/track/track.cpp

@@ -49,7 +49,7 @@ Track::Track() :
   ignore_arraymap_(0),
   arraymap_invalid_(false)
 {
-  AddInput(kBlockInput, NodeValue::kNone, InputFlags(kInputFlagArray | kInputFlagNotKeyframable | kInputFlagHidden | kInputFlagIgnoreConnections));
+  AddInput(kBlockInput, NodeValue::kNone, InputFlags(kInputFlagArray | kInputFlagNotKeyframable | kInputFlagHidden | kInputFlagIgnoreInvalidations));
 
   AddInput(kMutedInput, NodeValue::kBoolean, false, InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable));
 

app/node/param.h

@@ -37,7 +37,7 @@ enum InputFlag : uint64_t {
   kInputFlagNotKeyframable = 0x2,
   kInputFlagNotConnectable = 0x4,
   kInputFlagHidden = 0x8,
-  kInputFlagIgnoreConnections = 0x10,
+  kInputFlagIgnoreInvalidations = 0x10,
 
   kInputFlagStatic = kInputFlagNotKeyframable | kInputFlagNotConnectable
 };

app/node/project/sequence/sequence.cpp

@@ -43,7 +43,7 @@ Sequence::Sequence()
     // Create track input
     QString track_input_id = kTrackInputFormat.arg(i);
 
-    AddInput(track_input_id, NodeValue::kNone, InputFlags(kInputFlagNotKeyframable | kInputFlagArray | kInputFlagHidden | kInputFlagIgnoreConnections));
+    AddInput(track_input_id, NodeValue::kNone, InputFlags(kInputFlagNotKeyframable | kInputFlagArray | kInputFlagHidden | kInputFlagIgnoreInvalidations));
 
     TrackList* list = new TrackList(this, static_cast<Track::Type>(i), track_input_id);
     track_lists_.replace(i, list);

app/window/mainwindow/mainwindow.cpp

@@ -603,10 +603,15 @@ void MainWindow::FolderPanelCloseRequested()
 
 TimelinePanel* MainWindow::AppendTimelinePanel()
 {
+  TimelinePanel *previous = nullptr;
+  if (!timeline_panels_.empty()) {
+    previous = timeline_panels_.last();
+  }
+
   TimelinePanel* panel = AppendPanelInternal(QStringLiteral("TimelinePanel"), timeline_panels_);
 
-  if (timeline_panels_.size() > 1) {
-    timeline_panels_.last()->addDockWidgetAsTab(panel);
+  if (previous) {
+    previous->addDockWidgetAsTab(panel);
   } else {
     panel->SetSignalInsteadOfClose(false);
   }

app/window/mainwindow/mainwindowlayoutinfo.cpp

@@ -74,7 +74,6 @@ MainWindowLayoutInfo MainWindowLayoutInfo::fromXml(QXmlStreamReader *reader, con
 
   // Really basic version checking, in the future we may use this to parse multiple versions
   if (file_version != kVersion) {
-    return info;
   }
 
   while (XMLReadNextStartElement(reader)) {

ext/CMakeLists.txt

@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-add_subdirectory(core)
+add_subdirectory(core EXCLUDE_FROM_ALL)
 
 set(KDDockWidgets_STATIC ON CACHE INTERNAL "Force KDDockWidgets to build statically")
 set(KDDockWidgets_QT6 ${BUILD_QT6} CACHE INTERNAL "Conform KDDockWidgets' Qt 6 setting to ours")
-add_subdirectory(KDDockWidgets)
+add_subdirectory(KDDockWidgets EXCLUDE_FROM_ALL)