diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2016-10-08 16:05:13 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2016-10-08 16:05:13 +0000 |
| commit | 6092d5422b03608db00f18e6ad8c87465b5dc3e8 (patch) | |
| tree | 2ae791c03acda4ca0bf1cc2fb309a94c39cbd058 /src/livarot/Shape.cpp | |
| parent | [Bug #770681] KEY MAPPING: Comma and period hijacked by scaling. (diff) | |
| parent | Made the style-utils.h license dual-with-GPLv2+. (diff) | |
| download | inkscape-6092d5422b03608db00f18e6ad8c87465b5dc3e8.tar.gz inkscape-6092d5422b03608db00f18e6ad8c87465b5dc3e8.zip | |
merge trunk-refactoring
(bzr r15156)
Diffstat (limited to '')
| -rw-r--r-- | src/livarot/Shape.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/livarot/Shape.cpp b/src/livarot/Shape.cpp index 0bb3390e8..33b383947 100644 --- a/src/livarot/Shape.cpp +++ b/src/livarot/Shape.cpp @@ -1688,8 +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 == true && bs == false ) return -1; - if ( as == false && bs == true ) return 1; + if ( as && !bs ) return -1; + if ( !as && bs ) return 1; } return tstSi; } |