diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-11-09 20:50:56 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-11-09 20:50:56 +0300 |
commit | cf751e3914abb95f160ad9030c80f71cd2362816 (patch) | |
tree | c5053f4a330ac622e77925c1336d2eaaa588fe04 /source/blender/draw | |
parent | cde2bd1828ea9f2f5f6a4b5001593695ccf224d7 (diff) | |
parent | 60c4d0b5fb76a8bf2e53b760f92f3d9febecf62d (diff) |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index f51328e9bc9..5a25de1a3ca 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1740,11 +1740,10 @@ static void DRW_render_gpencil_to_image(RenderEngine *engine, void DRW_render_gpencil(struct RenderEngine *engine, struct Depsgraph *depsgraph) { - /* Early out if there are no grease pencil objects, especially important - * to avoid failing in in background renders without OpenGL context. */ - if (!DRW_render_check_grease_pencil(depsgraph)) { - return; - } + /* This function should only be called if there are are grease pencil objects, + * especially important to avoid failing in in background renders without OpenGL + * context. */ + BLI_assert(DRW_render_check_grease_pencil(depsgraph)); Scene *scene = DEG_get_evaluated_scene(depsgraph); ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph); |