diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-03-07 23:40:41 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-03-07 23:40:41 +0000 |
| commit | ffca253daf7e55a0508c15393d672e01c65e2df0 (patch) | |
| tree | 433af1c703dab415442346ff4161586f87ad7315 /src/splivarot.cpp | |
| parent | Permanent show outline in BSpline mode (diff) | |
| parent | Fix deprecated Gtkmm symbols in preferences widget (diff) | |
| download | inkscape-ffca253daf7e55a0508c15393d672e01c65e2df0.tar.gz inkscape-ffca253daf7e55a0508c15393d672e01c65e2df0.zip | |
update to trunk
(bzr r11950.1.48)
Diffstat (limited to 'src/splivarot.cpp')
| -rw-r--r-- | src/splivarot.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/splivarot.cpp b/src/splivarot.cpp index 8ce9a012b..061d32554 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -261,10 +261,13 @@ sp_selected_path_boolop(SPDesktop *desktop, bool_op bop, const unsigned int verb theShapeB->ConvertToShape(theShape, origWind[curOrig]); - // les elements arrivent en ordre inverse dans la liste - theShape->Booleen(theShapeB, theShapeA, bop); - - { + if (theShapeA->numberOfEdges() == 0) { + Shape *swap = theShapeB; + theShapeB = theShapeA; + theShapeA = swap; + } else if (theShapeB->numberOfEdges() > 0) { + // les elements arrivent en ordre inverse dans la liste + theShape->Booleen(theShapeB, theShapeA, bop); Shape *swap = theShape; theShape = theShapeA; theShapeA = swap; |