Commit: 852b5c58ab2199a9f4dcea4ca22f9eb46e3b4f3b
Author: Antonio Vazquez
Date: Wed May 23 16:38:09 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB852b5c58ab2199a9f4dcea4ca22f9eb46e3b4f3b
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/render/intern/source/external_engine.c
index 7297a5385d1,7655645f1e7..1f27652f8cd
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@@ -730,11 -729,16 +729,19 @@@ int RE_engine_render(Render *re, int do
ViewLayer *view_layer =
BLI_findstring(&re->scene->view_layers, view_layer_iter->name,
offsetof(ViewLayer, name));
engine_depsgraph_init(engine, view_layer);
+ if (type->update) {
+ type->update(engine, re->main,
engine->depsgraph);
+ }
+
+ if (re->draw_lock) {
+ re->draw_lock(re->dlh, 0);
+ }
+
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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
