Allow LPE clip or mask hasent effect applied

(bzr r15703.1.3)

1 files changed, 5 insertions, 1 deletions

diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp
index b08772826..68f9843d5 100644
--- a/src/sp-lpe-item.cpp
+++ b/src/sp-lpe-item.cpp
@@ -220,6 +220,7 @@ bool SPLPEItem::performPathEffect(SPCurve *curve, SPShape *current, bool is_clip
     if (!curve) {
         return false;
     }
+    bool has_lpe_clipmask = false;
     if (this->hasPathEffect() && this->pathEffectsEnabled()) {
         for (PathEffectList::iterator it = this->path_effect_list->begin(); it != this->path_effect_list->end(); ++it)
         {
@@ -245,6 +246,9 @@ bool SPLPEItem::performPathEffect(SPCurve *curve, SPShape *current, bool is_clip
                     // yet, we don't alter the path
                     return false;
                 }
+                if (lpe->apply_to_clippath_and_mask) {
+                    has_lpe_clipmask = true;
+                }
                 if (!is_clip_or_mask || (is_clip_or_mask && lpe->apply_to_clippath_and_mask)) {
                     // Groups have their doBeforeEffect called elsewhere
                     if (current) {
@@ -272,7 +276,7 @@ bool SPLPEItem::performPathEffect(SPCurve *curve, SPShape *current, bool is_clip
                 }
             }
         }
-        if(!SP_IS_GROUP(this) && !is_clip_or_mask){
+        if(!SP_IS_GROUP(this) && !is_clip_or_mask && has_lpe_clipmask){
             this->apply_to_clippath(this);
             this->apply_to_mask(this);
         }