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

one last ripple bug (and transition bug)

Browse Source
This commit is contained in:
itsmattkc
2018-12-30 22:29:16 +11:00
parent c81714fe73
commit f44cf37337
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/sequence.cpp
+9 -9
View File
@@ -58,16 +58,16 @@ void Sequence::hard_delete_transition(Clip *c, int type) {
int transition_index = (type == TA_OPENING_TRANSITION) ? c->opening_transition : c->closing_transition;
if (transition_index > -1) {
bool del = true;
for (int i=0;i<clips.size();i++) {
Clip* cc = clips.at(i);
if (cc != NULL
&& c != cc
&& (cc->opening_transition == transition_index
|| cc->closing_transition == transition_index)) {
// another clip is using this, don't delete just yet
del = false;
break;
Transition* t = transitions.at(transition_index);
if (t->secondary_clip != NULL) {
if (type == TA_OPENING_TRANSITION) {
// convert to closing transition
t->parent_clip = t->secondary_clip;
}
del = false;
t->secondary_clip = NULL;
}
if (del) {
ui/timelinewidget.cpp
+2 -2
View File
@@ -1834,8 +1834,8 @@ void TimelineWidget::mouseMoveEvent(QMouseEvent *event) {
for (int j=0;j<clip_list.size();j++) {
Clip* compare = clip_list.at(j);
if (compare->track == c->track) {
if ((panel_timeline->trim_in_point && compare->timeline_out < c->timeline_out)
|| (!panel_timeline->trim_in_point && compare->timeline_in > c->timeline_in)) {
if ((!clip_is_post && compare->timeline_out < c->timeline_out)
|| (clip_is_post && compare->timeline_in > c->timeline_in)) {
clip_list[j] = c;
}
found = true;