oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'node-rework' into track-redux

Browse Source
This commit is contained in:
itsmattkc
2023-02-21 09:33:52 -08:00
parent eaa9548e3b f9cd28a694
commit bef8fd7b50
85 changed files with 1684 additions and 1809 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/project/folder/folder.cpp
+2 -2
View File
@@ -21,10 +21,10 @@
#include "folder.h"
#include "common/xmlutils.h"
#include "node/nodeundo.h"
#include "node/project/footage/footage.h"
#include "node/project/sequence/sequence.h"
#include "ui/icons/icons.h"
#include "widget/nodeview/nodeviewundo.h"
namespace olive {
@@ -164,7 +164,7 @@ void Folder::RemoveElementCommand::redo()
NodeInput connected_input(folder_, Folder::kChildInput, remove_index_);
subcommand_ = new MultiUndoCommand();
subcommand_->add_child(new NodeEdgeRemoveCommand(folder_->GetConnectedOutput(connected_input), connected_input));
subcommand_->add_child(new Node::ArrayRemoveCommand(folder_, Folder::kChildInput, remove_index_));
subcommand_->add_child(new NodeArrayRemoveCommand(folder_, Folder::kChildInput, remove_index_));
}
}
app/node/project/sequence/sequence.cpp
+2 -4
View File
@@ -24,7 +24,7 @@
#include "panel/timeline/timeline.h"
#include "ui/icons/icons.h"
#include "widget/timelinewidget/undo/timelineundogeneral.h"
#include "timeline/timelineundogeneral.h"
namespace olive {
@@ -43,9 +43,7 @@ Sequence::Sequence()
// Create track input
QString track_input_id = kTrackInputFormat.arg(i);
AddInput(track_input_id, NodeValue::kNone, InputFlags(kInputFlagNotKeyframable | kInputFlagArray | kInputFlagHidden));
IgnoreInvalidationsFrom(track_input_id);
AddInput(track_input_id, NodeValue::kNone, InputFlags(kInputFlagNotKeyframable | kInputFlagArray | kInputFlagHidden | kInputFlagIgnoreConnections));
TrackList* list = new TrackList(this, static_cast<Track::Type>(i), track_input_id);
track_lists_.replace(i, list);
app/node/project/serializer/serializer220403.cpp
+1 -1
View File
@@ -681,7 +681,7 @@ void ProjectSerializer220403::PostConnect(const XMLNodeData &xml_node_data) cons
l.group->AddInputPassthrough(resolved, l.passthrough_id);
l.group->SetInputFlags(l.passthrough_id, resolved.GetFlags() | l.custom_flags);
l.group->SetInputFlag(l.passthrough_id, InputFlag(l.custom_flags.value()));
if (!l.custom_name.isEmpty()) {
l.group->SetInputName(l.passthrough_id, l.custom_name);