diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-09-16 19:41:04 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-09-19 21:05:29 +0000 |
| commit | 09d08f4af1537503dd08bf908d121a853fc2f689 (patch) | |
| tree | d38a94ed0c5a44e0a0f8476881486a2776bd3a45 /src | |
| parent | Fix operands in LPE bool (diff) | |
| download | inkscape-09d08f4af1537503dd08bf908d121a853fc2f689.tar.gz inkscape-09d08f4af1537503dd08bf908d121a853fc2f689.zip | |
merge to master and cleanup
Diffstat (limited to 'src')
| -rw-r--r-- | src/live_effects/lpe-bool.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/live_effects/lpe-bool.cpp b/src/live_effects/lpe-bool.cpp index c369f1f6d..2d9f491c6 100644 --- a/src/live_effects/lpe-bool.cpp +++ b/src/live_effects/lpe-bool.cpp @@ -373,11 +373,15 @@ void LPEBool::doEffect(SPCurve *curve) operand->setHidden(false); } bool_op_ex op = bool_operation.get_value(); +<<<<<<< Updated upstream <<<<<<< HEAD bool swap = !(swap_operands.get_value()); ======= bool swap = !swap_operands.get_value(); >>>>>>> Fix operands in LPE bool +======= + bool swap = !(swap_operands.get_value()); +>>>>>>> Stashed changes // operand->set_transform(i2anc_affine(sp_lpe_item, sp_lpe_item->parent)); Geom::Affine current = sp_item_transform_repr(sp_lpe_item); |