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

Merge branch 'modblending' into furtherocio

Browse Source
This commit is contained in:
itsmattkc
2019-03-11 00:09:18 +11:00
parent f25f8e145c 636cf64b3e
commit 64a4c4f2a5
46 changed files with 2012 additions and 1786 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/timeline.cpp
+4 -4
View File
@@ -1793,8 +1793,8 @@ void Timeline::transition_tool_click() {
QMenu transition_menu(this);
for (int i=0;i<effects.size();i++) {
const EffectMeta& em = effects.at(i);
for (int i=0;i<olive::effects.size();i++) {
const EffectMeta& em = olive::effects.at(i);
if (em.type == EFFECT_TYPE_TRANSITION && em.subtype == EFFECT_TYPE_VIDEO) {
QAction* a = transition_menu.addAction(em.name);
a->setObjectName("v");
@@ -1804,8 +1804,8 @@ void Timeline::transition_tool_click() {
transition_menu.addSeparator();
for (int i=0;i<effects.size();i++) {
const EffectMeta& em = effects.at(i);
for (int i=0;i<olive::effects.size();i++) {
const EffectMeta& em = olive::effects.at(i);
if (em.type == EFFECT_TYPE_TRANSITION && em.subtype == EFFECT_TYPE_AUDIO) {
QAction* a = transition_menu.addAction(em.name);
a->setObjectName("a");