summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabiertxof <jtx@jtx>2017-05-28 10:46:10 +0000
committerJabiertxof <jtx@jtx>2017-05-28 10:46:10 +0000
commit59143c117378ec4a866f34b1ba2e2930bfb17593 (patch)
tree58c2bedddaa1f166ab52092ac951566413ac9c21 /src
parentAllow doOnRemove in all LPE (diff)
downloadinkscape-59143c117378ec4a866f34b1ba2e2930bfb17593.tar.gz
inkscape-59143c117378ec4a866f34b1ba2e2930bfb17593.zip
Add a new value to LPE 'is_load' to know the lpe is just load, no previous values set yet to not LPE stored values when loading a previous file
(bzr r15711)
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/effect.cpp2
-rw-r--r--src/live_effects/effect.h1
-rw-r--r--src/live_effects/lpe-copy_rotate.cpp1
-rw-r--r--src/live_effects/lpe-mirror_symmetry.cpp1
4 files changed, 5 insertions, 0 deletions
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 23a4c9f3d..3a628b243 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -356,6 +356,7 @@ Effect::Effect(LivePathEffectObject *lpeobject)
is_visible(_("Is visible?"), _("If unchecked, the effect remains applied to the object but is temporarily disabled on canvas"), "is_visible", &wr, this, true),
show_orig_path(false),
keep_paths(false),
+ is_load(true),
lpeobj(lpeobject),
concatenate_before_pwd2(false),
sp_lpe_item(NULL),
@@ -511,6 +512,7 @@ Effect::doBeforeEffect (SPLPEItem const*/*lpeitem*/)
void Effect::doAfterEffect (SPLPEItem const* /*lpeitem*/)
{
+ is_load = false;
}
void Effect::doOnRemove (SPLPEItem const* /*lpeitem*/)
diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h
index cc0d53f12..e353eba23 100644
--- a/src/live_effects/effect.h
+++ b/src/live_effects/effect.h
@@ -133,6 +133,7 @@ public:
void editNextParamOncanvas(SPItem * item, SPDesktop * desktop);
bool apply_to_clippath_and_mask;
bool keep_paths; // set this to false allow retain extra generated objects, see measure line LPE
+ bool is_load;
bool upd_params;
BoolParam is_visible;
SPCurve * sp_curve;
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index 551cf1bf9..b29b5e493 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -109,6 +109,7 @@ void
LPECopyRotate::doAfterEffect (SPLPEItem const* lpeitem)
{
if (split_items) {
+ is_load = false;
SPDocument * document = SP_ACTIVE_DOCUMENT;
if (!document) {
return;
diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index 8e68c483c..3fcc4ae3d 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -89,6 +89,7 @@ LPEMirrorSymmetry::~LPEMirrorSymmetry()
void
LPEMirrorSymmetry::doAfterEffect (SPLPEItem const* lpeitem)
{
+ is_load = false;
SPDocument * document = SP_ACTIVE_DOCUMENT;
if (!document) {
return;