summaryrefslogtreecommitdiffstats
path: root/src/extension/effect.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2017-12-25 23:46:18 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2017-12-25 23:46:18 +0000
commit60efec48f2861fba5e02ca4fff61bfdcef33f56f (patch)
tree2dbcec0c9c8d1453c422c10a53d691203f18e965 /src/extension/effect.cpp
parentFix start anchors (diff)
parentMerge about-box Gtkmm changes (diff)
downloadinkscape-60efec48f2861fba5e02ca4fff61bfdcef33f56f.tar.gz
inkscape-60efec48f2861fba5e02ca4fff61bfdcef33f56f.zip
Merge branch 'master' into powerpencilII
Diffstat (limited to 'src/extension/effect.cpp')
-rw-r--r--src/extension/effect.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index ef254f623..93b940732 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -274,6 +274,7 @@ Effect::effect (Inkscape::UI::View::View * doc)
ExecutionEnv executionEnv(this, doc);
+ execution_env = &executionEnv;
timer->lock();
executionEnv.run();
if (executionEnv.wait()) {
@@ -352,6 +353,12 @@ Effect::get_info_widget(void)
return Extension::get_info_widget();
}
+PrefDialog *
+Effect::get_pref_dialog (void)
+{
+ return _prefDialog;
+}
+
void
Effect::set_pref_dialog (PrefDialog * prefdialog)
{