From 09d08f4af1537503dd08bf908d121a853fc2f689 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Mon, 16 Sep 2019 21:41:04 +0200 Subject: merge to master and cleanup --- src/live_effects/lpe-bool.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/live_effects/lpe-bool.cpp') 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); -- cgit v1.2.3