merged with master
This commit is contained in:
@@ -298,8 +298,6 @@ void TextEffect::redraw(double timecode) {
|
||||
}
|
||||
|
||||
void TextEffect::shadow_enable(bool e) {
|
||||
close();
|
||||
|
||||
shadow_color->SetEnabled(e);
|
||||
shadow_angle->SetEnabled(e);
|
||||
shadow_distance->SetEnabled(e);
|
||||
|
||||
@@ -82,7 +82,7 @@ TimecodeEffect::TimecodeEffect(Clip* c, const EffectMeta* em) :
|
||||
offset_y_val = new DoubleField(offset_row, "offsety");
|
||||
|
||||
EffectRow* prepent_text_row = new EffectRow(this, tr("Prepend"));
|
||||
prepend_text = new StringField(prepent_text_row, "prepend");
|
||||
prepend_text = new StringField(prepent_text_row, "prepend", false);
|
||||
prepend_text->SetColumnSpan(2);
|
||||
}
|
||||
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
|
||||
#include "rendering/audio.h"
|
||||
#include "ui/mainwindow.h"
|
||||
#include "global/global.h"
|
||||
#include "global/debug.h"
|
||||
|
||||
#ifdef __linux__
|
||||
@@ -83,7 +84,7 @@ intptr_t hostCallback(AEffect* effect, int32_t opcode, int32_t index, intptr_t v
|
||||
// but we are aware of it
|
||||
break;
|
||||
case audioMasterEndEdit: // change made
|
||||
olive::MainWindow->setWindowModified(true);
|
||||
olive::Global->set_modified(true);
|
||||
break;
|
||||
default:
|
||||
qInfo() << "Plugin requested unhandled opcode" << opcode;
|
||||
|
||||
Reference in New Issue
Block a user