diff options
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 68d95b8e8..c369f1f6d 100644 --- a/src/live_effects/lpe-bool.cpp +++ b/src/live_effects/lpe-bool.cpp @@ -373,7 +373,11 @@ void LPEBool::doEffect(SPCurve *curve) operand->setHidden(false); } bool_op_ex op = bool_operation.get_value(); +<<<<<<< HEAD bool swap = !(swap_operands.get_value()); +======= + bool swap = !swap_operands.get_value(); +>>>>>>> Fix operands in LPE bool // operand->set_transform(i2anc_affine(sp_lpe_item, sp_lpe_item->parent)); Geom::Affine current = sp_item_transform_repr(sp_lpe_item); |