summaryrefslogtreecommitdiffstats
path: root/src/ui/tools/freehand-base.cpp
diff options
context:
space:
mode:
authorJabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es>2017-08-29 08:16:30 +0000
committerJabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es>2017-08-29 08:16:30 +0000
commitab42a100bc099fff74e8b25f9b04c21594c6f119 (patch)
treed5fde20d471766773993f24b1df5b21de9cc5f0a /src/ui/tools/freehand-base.cpp
parentParametrice into preferences magic numbers and other staff (diff)
parentRemove LPE Simplify from spiro and BSpline mode because made uncontrolable pa... (diff)
downloadinkscape-ab42a100bc099fff74e8b25f9b04c21594c6f119.tar.gz
inkscape-ab42a100bc099fff74e8b25f9b04c21594c6f119.zip
Merge from master
Diffstat (limited to 'src/ui/tools/freehand-base.cpp')
-rw-r--r--src/ui/tools/freehand-base.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 2fdc8fade..6f05526a7 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -372,8 +372,10 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
return;
}
bool simplify = prefs->getInt(tool_name(dc) + "/simplify", 0);
- if(simplify){
- double tol = prefs->getDoubleLimited(tool_name(dc) + "/tolerance", 10.0, 1.0, 100.0);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ guint mode = prefs->getInt("/tools/freehand/pencil/freehand-mode", 0);
+ if(simplify && mode == 0){
+ double tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0);
tol = tol/(100.0*(102.0-tol));
std::ostringstream ss;
ss << tol;