Fix Cycles headless render failing, after grease pencil merge.

Now it should at least succeed when there are no grease pencil objects.

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;
 	}