diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-12-17 06:34:53 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-17 06:34:53 +0400 |
commit | f9ec10688a634f446e5666eead66e865a1595b67 (patch) | |
tree | 4fa07e07dcb83e33c818c5d3e339a46be7b2a30d /source/blender/editors/space_sequencer/sequencer_draw.c | |
parent | bc0e1211de9765f0c1fc5196f3d72eff06cfb6d4 (diff) |
fix [#33501] Grease pencil in OpenGL render
With the view3d 'Render Only' option, grease pencil wouldn't draw, but for OpenGL render it did.
Since grease pencil can be very useful in opengl renders, enable grease pencil drawing with 'Render Only' option in the viewport,
and add a checkbox in the grease pencil header not to draw (unchecking each layer is annoying and applies to all spaces).
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_draw.c')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 1a84efa0b50..9cc6b3d07a2 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -1125,8 +1125,10 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq setlinestyle(0); } - /* draw grease-pencil (image aligned) */ - draw_gpencil_2dimage(C); + if (sseq->flag & SEQ_SHOW_GPENCIL) { + /* draw grease-pencil (image aligned) */ + draw_gpencil_2dimage(C); + } if (!scope) IMB_freeImBuf(ibuf); @@ -1134,9 +1136,10 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq /* ortho at pixel level */ UI_view2d_view_restore(C); - /* draw grease-pencil (screen aligned) */ - draw_gpencil_view2d(C, 0); - + if (sseq->flag & SEQ_SHOW_GPENCIL) { + /* draw grease-pencil (screen aligned) */ + draw_gpencil_view2d(C, 0); + } /* NOTE: sequencer mask editing isnt finished, the draw code is working but editing not, |