diff options
| author | Jabiertxof <jtx@jtx> | 2017-01-24 00:44:29 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx> | 2017-01-24 00:44:29 +0000 |
| commit | e282eca29c2cd9b97247db78f2375c8a64071d9c (patch) | |
| tree | b65774137221c8d183694fa2765cad1b08af9d93 /src/live_effects | |
| parent | Fixing to merge (diff) | |
| download | inkscape-e282eca29c2cd9b97247db78f2375c8a64071d9c.tar.gz inkscape-e282eca29c2cd9b97247db78f2375c8a64071d9c.zip | |
Some bug fix to prepare merge
(bzr r15392.1.9)
Diffstat (limited to 'src/live_effects')
| -rw-r--r-- | src/live_effects/effect.cpp | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-copy_rotate.cpp | 1 | ||||
| -rw-r--r-- | src/live_effects/lpe-measure-line.cpp | 1 | ||||
| -rw-r--r-- | src/live_effects/parameter/parameter.cpp | 3 |
4 files changed, 5 insertions, 2 deletions
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 3cfeface8..a0ab0d41c 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -70,6 +70,8 @@ #include "ui/tools/node-tool.h" #include "ui/tools-switch.h" #include "knotholder.h" +#include "path-chemistry.h" +#include "xml/sp-css-attr.h" #include "live_effects/lpeobject.h" #include "display/curve.h" diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 33c4d6e5b..b81451487 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -20,7 +20,6 @@ #include "display/curve.h" #include "svg/path-string.h" #include "svg/svg.h" -#include "path-chemistry.h" #include "style.h" #include "helper/geom.h" #include "xml/sp-css-attr.h" diff --git a/src/live_effects/lpe-measure-line.cpp b/src/live_effects/lpe-measure-line.cpp index 38f93ebb4..ef87be81c 100644 --- a/src/live_effects/lpe-measure-line.cpp +++ b/src/live_effects/lpe-measure-line.cpp @@ -664,7 +664,6 @@ LPEMeasureLine::doBeforeEffect (SPLPEItem const* lpeitem) } } -//TODO: Migrate the tree next function to effect.cpp/h to avoid duplication void LPEMeasureLine::doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/) { diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp index 76aa05bae..befac4df1 100644 --- a/src/live_effects/parameter/parameter.cpp +++ b/src/live_effects/parameter/parameter.cpp @@ -198,6 +198,9 @@ ScalarParam::param_set_increments(double step, double page) inc_page = page; } + + + } /* namespace LivePathEffect */ } /* namespace Inkscape */ |