diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-12-17 09:36:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-17 09:36:00 +0400 |
commit | 9ac713bdb577116f4af0ef5250efddf82f93cf69 (patch) | |
tree | 3731763ade006b3369c5d4aae22c33bb71d7de1a /source/blender/editors/space_view3d | |
parent | fe006c042661586a03d27ad5418ca373bfa48e45 (diff) |
missed this recent commit, while drawing grease pencil, draw if 'Render Only' is on.
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 7fccff861ab..d3dc8f9a75e 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -3182,14 +3182,14 @@ static void view3d_main_area_draw_info(const bContext *C, ARegion *ar, const cha glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); } + if (v3d->flag2 & V3D_SHOW_GPENCIL) { + /* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */ + draw_gpencil_view3d(scene, v3d, ar, FALSE); + } + if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) { Object *ob; - if (v3d->flag2 & V3D_SHOW_GPENCIL) { - /* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */ - draw_gpencil_view3d(scene, v3d, ar, FALSE); - } - drawcursor(scene, ar, v3d); if (U.uiflag & USER_SHOW_ROTVIEWICON) |