diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-01 15:21:50 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-01 15:47:02 +0300 |
commit | c48eb521642b5d94e5f0eb8fd15f7d587f407078 (patch) | |
tree | d3002dae430998981a425b8bff5b9e7b34f324c3 /source/blender/render | |
parent | ddd62f1b1063d69df5171c7b3457ffcffcc6b0e4 (diff) |
Fix Cycles headless render failing, after grease pencil merge.
Now it should at least succeed when there are no grease pencil objects.
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/external_engine.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 0b27cadd086..09ab3e39d5f 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -740,9 +740,15 @@ int RE_engine_render(Render *re, int do_all) type->render(engine, engine->depsgraph); /* grease pencil render over previous render result */ - DRW_render_gpencil(engine, engine->depsgraph); + if (!RE_engine_test_break(engine)) { + DRW_render_gpencil(engine, engine->depsgraph); + } engine_depsgraph_free(engine); + + if (RE_engine_test_break(engine)) { + break; + } } FOREACH_VIEW_LAYER_TO_RENDER_END; } |