diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2009-02-26 22:25:15 +0000 |
|---|---|---|
| committer | tweenk <tweenk@users.sourceforge.net> | 2009-02-26 22:25:15 +0000 |
| commit | fedea5f99af458a15b3f0b39c823fc0e86ffb9c6 (patch) | |
| tree | cf5e9e50d805b0f5407126d839ccc700f7601067 | |
| parent | Patch from Lubomir Rintel: fixes for GCC 4.4 (diff) | |
| download | inkscape-fedea5f99af458a15b3f0b39c823fc0e86ffb9c6.tar.gz inkscape-fedea5f99af458a15b3f0b39c823fc0e86ffb9c6.zip | |
Allow path exclusion to work on an arbitrary number of paths. Fixes bug
#335110.
(bzr r7381)
| -rw-r--r-- | src/splivarot.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/splivarot.cpp b/src/splivarot.cpp index f6ae9baa0..c8eab575f 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -127,8 +127,8 @@ sp_selected_path_boolop(SPDesktop *desktop, bool_op bop, const unsigned int verb } if (g_slist_length(il) > 2) { - if (bop == bool_op_diff || bop == bool_op_symdiff || bop == bool_op_cut || bop == bool_op_slice ) { - desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Select <b>exactly 2 paths</b> to perform difference, XOR, division, or path cut.")); + if (bop == bool_op_diff || bop == bool_op_cut || bop == bool_op_slice ) { + desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Select <b>exactly 2 paths</b> to perform difference, division, or path cut.")); return; } } @@ -138,8 +138,7 @@ sp_selected_path_boolop(SPDesktop *desktop, bool_op bop, const unsigned int verb // topmost object (differences, cuts) bool reverseOrderForOp = false; - // mettre les elements de la liste dans l'ordre pour ces operations - if (bop == bool_op_diff || bop == bool_op_symdiff || bop == bool_op_cut || bop == bool_op_slice) { + if (bop == bool_op_diff || bop == bool_op_cut || bop == bool_op_slice) { // check in the tree to find which element of the selection list is topmost (for 2-operand commands only) Inkscape::XML::Node *a = SP_OBJECT_REPR(il->data); Inkscape::XML::Node *b = SP_OBJECT_REPR(il->next->data); @@ -431,7 +430,7 @@ sp_selected_path_boolop(SPDesktop *desktop, bool_op bop, const unsigned int verb // get the source path object SPObject *source; - if ( bop == bool_op_diff || bop == bool_op_symdiff || bop == bool_op_cut || bop == bool_op_slice ) { + if ( bop == bool_op_diff || bop == bool_op_cut || bop == bool_op_slice ) { if (reverseOrderForOp) { source = SP_OBJECT(il->data); } else { |