From: buliabyak Date: Sat, 3 Mar 2007 03:42:31 +0000 (+0000) Subject: restore rendering markers in outline mode X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2dab2da6e1e49c33c13eae464884775c71311497;p=inkscape.git restore rendering markers in outline mode --- diff --git a/src/display/nr-arena-shape.cpp b/src/display/nr-arena-shape.cpp index b8bfee05c..b9a7fc737 100644 --- a/src/display/nr-arena-shape.cpp +++ b/src/display/nr-arena-shape.cpp @@ -853,10 +853,13 @@ nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == RENDERMODE_OUTLINE); - if (outline) { + if (outline) { // cairo outline rendering + pb->empty = FALSE; - return cairo_arena_shape_render_outline (ct, item, NR::Point(pb->area.x0, pb->area.y0)); - } + unsigned int ret = cairo_arena_shape_render_outline (ct, item, NR::Point(pb->area.x0, pb->area.y0)); + if (ret & NR_ARENA_ITEM_STATE_INVALID) return ret; + + } else { if ( shape->delayed_shp ) { if ( nr_rect_l_test_intersect(area, &item->bbox) ) { @@ -972,10 +975,11 @@ nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock nr_pixblock_release(&m); } - /* Just compose children into parent buffer */ + } // non-cairo non-outline branch + + /* Render markers into parent buffer */ for (NRArenaItem *child = shape->markers; child != NULL; child = child->next) { - unsigned int ret; - ret = nr_arena_item_invoke_render(ct, child, area, pb, flags); + unsigned int ret = nr_arena_item_invoke_render(ct, child, area, pb, flags); if (ret & NR_ARENA_ITEM_STATE_INVALID) return ret; }