Sorry, I should have gotten back to you earlier about this.

IMO, this is the wrong fix.

At the very least though, there are 2 critical issues here:

1. You've taken the function which should do nothing but draw a single Grease Pencil datablock (draw_gpd_data), and you've gone and stubbed extra context fudging crap into it so it now draws _2_of these. That's bad from a clean API perspective.

2. If you're going to have both scene and object gpencil data drawn at once, the scene should get drawn first. Think about this from an artist's perpective: if you've got a set painted via the scene level, the object level will likely contain overlays (e.g. popouts or extra characters only used sometimes) or other annotations (e.g. notes on where it should be moving) which are likely to be about the object in question, so you'd want these to appearover the top (or else, they just get buried by the scene strokes).

Let's be optimistic and say "at least it works better now" :P Anyway good points you are making, changing shouldn't be a big deal, though. I'll commit a patch addressing this issues, but will check with you if I can catch you before BCon5 starts (will be in ~1.5h :D)