diff options
| author | Antonioya <blendergit@gmail.com> | 2019-03-19 12:48:24 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2019-03-19 13:03:55 +0300 |
| commit | 34d6c04003775943ecf6a8015a97eb32452c7efb (patch) | |
| tree | db2205c66087d9b19946657b891f418c3bff30c6 /source/blender/editors/render | |
| parent | 40ecb2ded81ba7265c426f6680faf3417ff22aeb (diff) | |
Fix T62734: Crash when annotations are rendered from the VSE .view menu.
The render was using the old grease pencil code and not the new annotation code for render.
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 0e0292c8d71..7fb9dbdf3a6 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -265,7 +265,6 @@ static void screen_opengl_views_setup(OGLRender *oglrender) static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, RenderResult *rr) { Depsgraph *depsgraph = CTX_data_depsgraph(C); - ViewLayer *view_layer = CTX_data_view_layer(C); Scene *scene = oglrender->scene; ARegion *ar = oglrender->ar; View3D *v3d = oglrender->v3d; @@ -327,7 +326,7 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R G.f |= G_FLAG_RENDER_VIEWPORT; ED_gpencil_draw_ex( - view_layer, rv3d, scene, gpd, sizex, sizey, scene->r.cfra, SPACE_SEQ); + scene, gpd, sizex, sizey, scene->r.cfra, SPACE_SEQ); G.f &= ~G_FLAG_RENDER_VIEWPORT; gp_rect = MEM_mallocN(sizex * sizey * sizeof(unsigned char) * 4, "offscreen rect"); |