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

merged master and fixed superimpose effect

Browse Source
This commit is contained in:
itsmattkc
2019-03-22 02:48:59 +11:00
parent 184d275e9a b96d97aa07
commit 6173b721e2
31 changed files with 761 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/effectcontrols.cpp
+3 -2
View File
@@ -46,6 +46,7 @@
#include "panels/grapheditor.h"
#include "ui/viewerwidget.h"
#include "ui/menuhelper.h"
#include "ui/icons.h"
#include "project/clipboard.h"
#include "global/config.h"
#include "ui/timelineheader.h"
@@ -374,8 +375,8 @@ void EffectControls::setup_ui() {
veHeaderLayout->setSpacing(0);
veHeaderLayout->setMargin(0);
QIcon add_effect_icon(":/icons/add-effect.svg");
QIcon add_transition_icon(":/icons/add-transition.svg");
QIcon add_effect_icon = olive::icon::CreateIconFromSVG(":/icons/add-effect.svg", false);
QIcon add_transition_icon = olive::icon::CreateIconFromSVG(":/icons/add-transition.svg", false);
btnAddVideoEffect = new QPushButton();
btnAddVideoEffect->setIcon(add_effect_icon);