[Bf-blender-cvs] [e5220e2f7e1] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

Antonio Vazquez noreply at git.blender.org
Sat Feb 24 18:28:31 CET 2018


Commit: e5220e2f7e1941793fc5b690cfe5728b9c651ee4
Author: Antonio Vazquez
Date:   Sat Feb 24 18:02:36 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe5220e2f7e1941793fc5b690cfe5728b9c651ee4

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/draw/intern/draw_manager.c

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



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

diff --cc source/blender/draw/intern/draw_manager.c
index cea67778e53,4049108d286..b55f5853dad
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -3730,11 -3680,7 +3737,11 @@@ void DRW_render_to_image(RenderEngine *
  			 * For rendering depsgraph is to be owned by Render. */
  			DST.draw_ctx.depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true);
  
- 			engine_type->draw_engine->render_to_image(data, engine, render_result, render_layer);
+ 			engine_type->draw_engine->render_to_image(data, engine, render_layer, &render_rect);
 +
 +			/* grease pencil: render result is merged in the previous render result. */
 +			DRW_render_gpencil_to_image(engine, render_result, render_layer);
 +
  			DST.buffer_finish_called = false;
  			/* Force cache to reset. */
  			drw_viewport_cache_resize();



More information about the Bf-blender-cvs mailing list