From e8808f5e89d47f0b8693b6e133e7f98c4d5b328c Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 26 Dec 2019 19:29:48 +1100 Subject: [PATCH] shifted IC unblocking until after the split is done since the clips won't change --- app/node/block/block.cpp | 1 - app/widget/timelinewidget/undo/undo.cpp | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/node/block/block.cpp b/app/node/block/block.cpp index efe476cc3..56e256a1b 100644 --- a/app/node/block/block.cpp +++ b/app/node/block/block.cpp @@ -224,7 +224,6 @@ rational Block::MediaToSequenceTime(const rational &media_time) const void Block::CopyParameters(const Block *source, Block *dest) { dest->set_block_name(source->block_name()); - dest->set_media_in(source->media_in()); if (source->type() == kTransition && dest->type() == kTransition) { const TransitionBlock* src_t = static_cast(source); diff --git a/app/widget/timelinewidget/undo/undo.cpp b/app/widget/timelinewidget/undo/undo.cpp index b050b4e89..9689b56e4 100644 --- a/app/widget/timelinewidget/undo/undo.cpp +++ b/app/widget/timelinewidget/undo/undo.cpp @@ -418,15 +418,14 @@ void BlockSplitCommand::redo() new_block_->set_media_in(block_->media_out()); new_block_->set_media_out(original_media_out); - // Will re-parent new_block_ to the track's graph track_->InsertBlockAfter(new_block_, block_); - track_->UnblockInvalidateCache(); - foreach (NodeInput* transition, transitions_to_move_) { NodeParam::DisconnectEdge(block_->output(), transition); NodeParam::ConnectEdge(new_block_->output(), transition); } + + track_->UnblockInvalidateCache(); } void BlockSplitCommand::undo() @@ -438,12 +437,12 @@ void BlockSplitCommand::undo() TakeNodeFromParentGraph(new_block_, &memory_manager_); - track_->UnblockInvalidateCache(); - foreach (NodeInput* transition, transitions_to_move_) { NodeParam::DisconnectEdge(new_block_->output(), transition); NodeParam::ConnectEdge(block_->output(), transition); } + + track_->UnblockInvalidateCache(); } Block *BlockSplitCommand::new_block()