diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-06 21:38:30 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-06 21:38:30 +0000 |
| commit | 6f10c7f675fae8c20f24f01b7cffb861f3726e9d (patch) | |
| tree | a78b993f14603288e71637bb22f7a2929c8ba5bf /src/live_effects/lpe-attach-path.cpp | |
| parent | Prevent crash on "three knot" issue (diff) | |
| download | inkscape-6f10c7f675fae8c20f24f01b7cffb861f3726e9d.tar.gz inkscape-6f10c7f675fae8c20f24f01b7cffb861f3726e9d.zip | |
Properly allow effect stacking with knotholders (and add extra LPE functionality)
(bzr r13090.1.48)
Diffstat (limited to 'src/live_effects/lpe-attach-path.cpp')
| -rw-r--r-- | src/live_effects/lpe-attach-path.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/live_effects/lpe-attach-path.cpp b/src/live_effects/lpe-attach-path.cpp index 0cceb1cb7..96372892e 100644 --- a/src/live_effects/lpe-attach-path.cpp +++ b/src/live_effects/lpe-attach-path.cpp @@ -62,15 +62,10 @@ void LPEAttachPath::resetDefaults(SPItem const * item) curve_end_previous_origin = end_path_curve_end.getOrigin(); } -void LPEAttachPath::doBeforeEffect(SPLPEItem const *lpeitem) -{ - lpe_effect = const_cast<SPLPEItem*> (lpeitem); -} - void LPEAttachPath::doEffect (SPCurve * curve) { std::vector<Geom::Path> this_pathv = curve->get_pathvector(); - if (lpe_effect && !this_pathv.empty()) { + if (sp_lpe_item && !this_pathv.empty()) { Geom::Path p = Geom::Path(this_pathv.front().initialPoint()); bool set_start_end = start_path_curve_end.getOrigin() != curve_start_previous_origin; @@ -79,7 +74,7 @@ void LPEAttachPath::doEffect (SPCurve * curve) if (start_path.linksToPath()) { std::vector<Geom::Path> linked_pathv = start_path.get_pathvector(); - Geom::Affine linkedtransform = start_path.getObject()->getRelativeTransform(lpe_effect); + Geom::Affine linkedtransform = start_path.getObject()->getRelativeTransform(sp_lpe_item); if ( !linked_pathv.empty() ) { @@ -132,7 +127,7 @@ void LPEAttachPath::doEffect (SPCurve * curve) if (end_path.linksToPath()) { std::vector<Geom::Path> linked_pathv = end_path.get_pathvector(); - Geom::Affine linkedtransform = end_path.getObject()->getRelativeTransform(lpe_effect); + Geom::Affine linkedtransform = end_path.getObject()->getRelativeTransform(sp_lpe_item); if ( !linked_pathv.empty() ) { |