summaryrefslogtreecommitdiffstats
path: root/src/livarot/Shape.cpp
diff options
context:
space:
mode:
authorShlomi Fish <shlomif@shlomifish.org>2016-09-29 17:30:52 +0000
committerShlomi Fish <shlomif@shlomifish.org>2016-09-29 17:30:52 +0000
commit160b9ef68f49c39034b6f9e1695e9a8c9e80cf6a (patch)
tree5ea384a9d711273f585dc718f36bbd82f8a170ae /src/livarot/Shape.cpp
parentMerged. (diff)
downloadinkscape-160b9ef68f49c39034b6f9e1695e9a8c9e80cf6a.tar.gz
inkscape-160b9ef68f49c39034b6f9e1695e9a8c9e80cf6a.zip
Fix a regression introduced by the refactoring.
Thanks to Mc for noticing it here: https://code.launchpad.net/~shlomif-gmail/inkscape/trunk-refactoring/+merge/307193 (bzr r15100.1.24)
Diffstat (limited to 'src/livarot/Shape.cpp')
-rw-r--r--src/livarot/Shape.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/livarot/Shape.cpp b/src/livarot/Shape.cpp
index ea6180bee..33b383947 100644
--- a/src/livarot/Shape.cpp
+++ b/src/livarot/Shape.cpp
@@ -1688,7 +1688,8 @@ Shape::CmpToVert (Geom::Point ax, Geom::Point bx,bool as,bool bs)
if (si > 0.000001) tstSi = 1;
if (si < -0.000001) tstSi = -1;
if ( tstSi == 0 ) {
- if ( (as && !bs) || (!as && bs) ) return -1;
+ if ( as && !bs ) return -1;
+ if ( !as && bs ) return 1;
}
return tstSi;
}