diff options
| author | bulia byak <buliabyak@gmail.com> | 2007-03-14 18:03:01 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2007-03-14 18:03:01 +0000 |
| commit | 752f4aafca593b84195b3d13062a64437d0166c8 (patch) | |
| tree | b874b3464ee2f7dd544bdc8e8ebfc080370a1bb7 /src | |
| parent | fix i18n to match the correct RTL rendering fixed by cyreve (diff) | |
| download | inkscape-752f4aafca593b84195b3d13062a64437d0166c8.tar.gz inkscape-752f4aafca593b84195b3d13062a64437d0166c8.zip | |
fix bug where master opacity did not affect markers
(bzr r2645)
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/nr-arena-shape.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
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; } |