two picking optimizations: 1 use our canvas' viewbox so that invisible segments can...

[inkscape.git] / src / display / nr-arena.cpp

diff --git a/src/display/nr-arena.cpp b/src/display/nr-arena.cpp
index ba845d1a296b24dc0fa56de18c9ffa5f53d00932..7c0664d16a6b394164e2ec3cc1016ab977aa563b 100644 (file)
--- a/src/display/nr-arena.cpp
+++ b/src/display/nr-arena.cpp
@@ -54,6 +54,7 @@ nr_arena_init (NRArena *arena)
        arena->delta = 0; // to be set by desktop from prefs
        arena->rendermode = RENDERMODE_NORMAL; // default is normal render
        arena->outlinecolor = 0xff; // black; to be set by desktop from bg color
+       arena->canvasarena = NULL; 
 }
 
 static void
@@ -111,7 +112,7 @@ nr_arena_render_paintserver_fill (NRPixBlock *pb, NRRectL *area, SPPainter *pain
        nr_pixblock_setup_fast (&cb_opa, NR_PIXBLOCK_MODE_R8G8B8A8N, area->x0, area->y0, area->x1, area->y1, TRUE);
 
         // if memory allocation failed, abort 
-        if (cb.data.px == NULL || cb_opa.data.px == NULL) {
+       if ((cb.size != NR_PIXBLOCK_SIZE_TINY && cb.data.px == NULL) || (cb_opa.size != NR_PIXBLOCK_SIZE_TINY && cb_opa.data.px == NULL)) {
             return;
         }