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:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-10-12 11:01:30 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-10-19 15:26:40 +0300
commit9d4e3b0e6379cd5b0c8e9b2bec3c8ae8d2c68634 (patch)
tree4becb42f32c2a95932091ff95a893f3ef83b28d4
parent4736664da6a3fa17fe7523e9f3b1791ad44190b6 (diff)
Fix T49622: Grease pencil not rendering out of VSE
-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 b6be68ce4d1..ce4b3b7d52c 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -445,7 +445,7 @@ static void add_gpencil_renderpass(OGLRender *oglrender, RenderResult *rr, Rende
if (BLI_listbase_is_empty(&gpd->layers)) {
return;
}
- if ((oglrender->v3d->flag2 & V3D_SHOW_GPENCIL) == 0) {
+ if (oglrender->v3d != NULL && (oglrender->v3d->flag2 & V3D_SHOW_GPENCIL) == 0) {
return;
}