Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2014-12-05 05:47:23 +0300
committerJoshua Leung <aligorith@gmail.com>2014-12-05 05:47:23 +0300
commit3673a0322644a07333ddd648320d371e54c4d9fc (patch)
tree5a5068a9bd6c12f35cdbae869481442d12ab1eee /source/blender/editors/render/render_opengl.c
parent844909b294a61292b6c4677cb60849a9cb5596d9 (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/editors/render/render_opengl.c')
-rw-r--r--source/blender/editors/render/render_opengl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index 433630f6ed4..7df281b70bd 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -272,7 +272,7 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
/* shouldnt suddenly give errors mid-render but possible */
char err_out[256] = "unknown";
ImBuf *ibuf_view = ED_view3d_draw_offscreen_imbuf_simple(scene, scene->camera, oglrender->sizex, oglrender->sizey,
- IB_rect, OB_SOLID, false, true,
+ IB_rect, OB_SOLID, false, true, true,
(draw_sky) ? R_ADDSKY : R_ALPHAPREMUL, err_out);
camera = scene->camera;