griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into blender2.8

Browse Source
This commit is contained in:
Dalai Felinto
2016-10-13 16:42:54 +00:00
parent ecbedce81e 625b504b23
commit dfa5b32c8c
31 changed files with 528 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/render/render_opengl.c
View File

@@ -442,7 +442,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;
}