[Bf-blender-cvs] [8f366d494ed] greasepencil-object: Fix render after merge

Antonio Vazquez noreply at git.blender.org
Thu Apr 5 11:56:02 CEST 2018


Commit: 8f366d494edd2d6adf13b934c6295fb1e9573639
Author: Antonio Vazquez
Date:   Thu Apr 5 11:55:41 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB8f366d494edd2d6adf13b934c6295fb1e9573639

Fix render after merge

===================================================================

M	source/blender/render/intern/source/external_engine.c

===================================================================

diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 617e49c5d0f..192b9134103 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -789,6 +789,9 @@ int RE_engine_render(Render *re, int do_all)
 
 			type->render_to_image(engine, engine->depsgraph);
 
+			/* grease pencil render over previous render result */
+			DRW_render_gpencil(engine, engine->depsgraph);
+
 			engine_depsgraph_free(engine);
 		}
 		FOREACH_VIEW_LAYER_TO_RENDER_END;



More information about the Bf-blender-cvs mailing list