shifted IC unblocking until after the split is done since the clips won't change

This commit is contained in:
itsmattkc
2019-12-26 19:29:48 +11:00
parent 5d82aa1a7d
commit e8808f5e89
2 changed files with 4 additions and 6 deletions
-1
View File
@@ -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<const TransitionBlock*>(source);
+4 -5
View File
@@ -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()