diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-01 16:22:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-01 16:22:13 +0300 |
| commit | 8901263b5f04152a9c6a897c5115acd51be11bf1 (patch) | |
| tree | 14629685150a04440e2629fd45bd90891b8767ed /source/blender/editors/render/render_opengl.c | |
| parent | f64df0e1024c2447ad449d0bf63def871ee47925 (diff) | |
| parent | 714e85b5344db7d9c9c7ac0a91cd0bb574c35353 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/render/render_opengl.c')
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 2 |
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 55c07140216..24e8af1c6ec 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -315,7 +315,7 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr) RE_render_result_rect_from_ibuf(rr, &scene->r, out, oglrender->view_id); IMB_freeImBuf(out); } - else if (gpd){ + else if (gpd) { /* If there are no strips, Grease Pencil still needs a buffer to draw on */ ImBuf *out = IMB_allocImBuf(oglrender->sizex, oglrender->sizey, 32, IB_rect); RE_render_result_rect_from_ibuf(rr, &scene->r, out, oglrender->view_id); |