summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-06-26 15:58:53 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-06-26 15:58:53 +0000
commitb640fe160c2dc99e148df11eca088aaa5feb443a (patch)
treea282fe56b80daa08e1701b0e739de8e72c3d0e89 /src
parentremoved reverse path, commented why (diff)
parentImprove hidding helper path when show outline toogle is on (diff)
downloadinkscape-b640fe160c2dc99e148df11eca088aaa5feb443a.tar.gz
inkscape-b640fe160c2dc99e148df11eca088aaa5feb443a.zip
update to trunk
(bzr r13645.1.98)
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/lpe-bspline.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/live_effects/lpe-bspline.cpp b/src/live_effects/lpe-bspline.cpp
index ecbfef76a..99e2a55fd 100644
--- a/src/live_effects/lpe-bspline.cpp
+++ b/src/live_effects/lpe-bspline.cpp
@@ -9,6 +9,7 @@
#include "sp-path.h"
#include "svg/svg.h"
#include "xml/repr.h"
+#include "preferences.h"
// TODO due to internal breakage in glibmm headers, this must be last:
#include <glibmm/i18n.h>
@@ -43,7 +44,7 @@ LPEBSpline::LPEBSpline(LivePathEffectObject *lpeobject)
steps.param_set_digits(0);
helper_size.param_set_range(0.0, 999.0);
- helper_size.param_set_increments(5, 5);
+ helper_size.param_set_increments(1, 1);
helper_size.param_set_digits(2);
}
@@ -76,13 +77,15 @@ void LPEBSpline::doEffect(SPCurve *curve)
Geom::PathVector const original_pathv = curve->get_pathvector();
curve->reset();
-
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
for (Geom::PathVector::const_iterator path_it = original_pathv.begin();
path_it != original_pathv.end(); ++path_it) {
if (path_it->empty()) {
continue;
}
- hp.push_back(*path_it);
+ if (!prefs->getBool("/tools/nodes/show_outline", true)){
+ hp.push_back(*path_it);
+ }
Geom::Path::const_iterator curve_it1 = path_it->begin();
Geom::Path::const_iterator curve_it2 = ++(path_it->begin());
Geom::Path::const_iterator curve_endit = path_it->end_default();