From: buliabyak <buliabyak@users.sourceforge.net>
Date: Wed, 14 Mar 2007 18:03:01 +0000 (+0000)
Subject: fix bug where master opacity did not affect markers
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fc536fb96a9dd0a7d6f2c87e7084bb68c155f7ef;p=inkscape.git

fix bug where master opacity did not affect markers
---

diff --git a/src/display/nr-arena-shape.cpp b/src/display/nr-arena-shape.cpp
index afc30acb8..6aa259ba6 100644
--- a/src/display/nr-arena-shape.cpp
+++ b/src/display/nr-arena-shape.cpp
@@ -379,11 +379,12 @@ nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, g
         }
         item->render_opacity = FALSE;
     }
-    if ( item->render_opacity == TRUE
-         && shape->_fill.paint.type()   != NRArenaShape::Paint::NONE
-         && shape->_stroke.paint.type() != NRArenaShape::Paint::NONE )
+    if (  (shape->_fill.paint.type() != NRArenaShape::Paint::NONE && 
+           shape->_stroke.paint.type() != NRArenaShape::Paint::NONE)
+          || (shape->markers)
+        )
     {
-        // don't merge item opacity with paint opacity if there is a stroke on the fill
+        // don't merge item opacity with paint opacity if there is a stroke on the fill, or markers on stroke
         item->render_opacity = FALSE;
     }