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

Merge branch 'master' of https://github.com/olive-editor/olive into blendmodefix

Browse Source
This commit is contained in:
itsmattkc
2019-01-27 10:46:20 +11:00
parent 7a436ef51f a4eb3df21a
commit 0522868076
4 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/undo.cpp
+11 -7
View File
@@ -513,14 +513,18 @@ void AddClipCommand::redo() {
int linkOffset = seq->clips.size();
for (int i=0;i<clips.size();i++) {
Clip* original = clips.at(i);
Clip* copy = original->copy(seq);
copy->linked.resize(original->linked.size());
for (int j=0;j<original->linked.size();j++) {
copy->linked[j] = original->linked.at(j) + linkOffset;
if (original != nullptr) {
Clip* copy = original->copy(seq);
copy->linked.resize(original->linked.size());
for (int j=0;j<original->linked.size();j++) {
copy->linked[j] = original->linked.at(j) + linkOffset;
}
if (original->opening_transition > -1) copy->opening_transition = original->get_opening_transition()->copy(copy, nullptr);
if (original->closing_transition > -1) copy->closing_transition = original->get_closing_transition()->copy(copy, nullptr);
seq->clips.append(copy);
} else {
seq->clips.append(nullptr);
}
if (original->opening_transition > -1) copy->opening_transition = original->get_opening_transition()->copy(copy, nullptr);
if (original->closing_transition > -1) copy->closing_transition = original->get_closing_transition()->copy(copy, nullptr);
seq->clips.append(copy);
}
}
mainWindow->setWindowModified(true);