diff options
author | Joshua Leung <aligorith@gmail.com> | 2014-12-05 05:47:23 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2014-12-05 05:47:23 +0300 |
commit | 3673a0322644a07333ddd648320d371e54c4d9fc (patch) | |
tree | 5a5068a9bd6c12f35cdbae869481442d12ab1eee /source/blender/blenkernel/intern/sequencer.c | |
parent | 844909b294a61292b6c4677cb60849a9cb5596d9 (diff) |
Grease Pencil sketches get included when doing OpenGL previews for scene strips in sequencer
After double checking the sequencer code, there doesn't seem to be any reason to
exclude these from the sequencer previews. This makes it possible to use the
sequencer to non-destructively chain together difference Grease Pencil animated
shots together without having to render each image sequence first, allowing for
a smoother workflow.
Just in case the initial assumption isn't entirely correct, I've put in place
an extra arg to the relevant functions which can be hooked up to a suitable
option on the scene strip later to turn this on/off as needed.
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 86a2b1d8b61..06eecc4b015 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -2586,7 +2586,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq ibuf = sequencer_view3d_cb(scene, camera, width, height, IB_rect, context->scene->r.seq_prev_type, (context->scene->r.seq_flag & R_SEQ_SOLID_TEX) != 0, - true, scene->r.alphamode, err_out); + true, true, scene->r.alphamode, err_out); if (ibuf == NULL) { fprintf(stderr, "seq_render_scene_strip failed to get opengl buffer: %s\n", err_out); } |