diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-09-16 19:42:06 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-09-19 21:05:29 +0000 |
| commit | 239b3c87542b9012eb02106cc2a20ab149cec056 (patch) | |
| tree | 26c29a09765cf0dc4d91f605e03c7846947f0911 /src/live_effects | |
| parent | merge to master and cleanup (diff) | |
| download | inkscape-239b3c87542b9012eb02106cc2a20ab149cec056.tar.gz inkscape-239b3c87542b9012eb02106cc2a20ab149cec056.zip | |
sink with master and cleanup
Diffstat (limited to 'src/live_effects')
| -rw-r--r-- | src/live_effects/lpe-bool.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/live_effects/lpe-bool.cpp b/src/live_effects/lpe-bool.cpp index 2d9f491c6..68d95b8e8 100644 --- a/src/live_effects/lpe-bool.cpp +++ b/src/live_effects/lpe-bool.cpp @@ -373,15 +373,7 @@ 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); |