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

[Antonio Vazquez]

Commit: 811a6c298c2f0257e47abcd4c89025244c17244c
Author: Antonio Vazquez
Date:   Wed Feb 28 10:05:27 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB811a6c298c2f0257e47abcd4c89025244c17244c

Merge branch 'blender2.8' into greasepencil-object

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

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



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

diff --cc source/blender/draw/intern/DRW_render.h
index ef23f8c9240,2a119651ffd..ffb76515351
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@@ -412,8 -410,7 +412,8 @@@ struct DefaultTextureList     *DRW_view
  
  void DRW_viewport_request_redraw(void);
  
- void DRW_render_to_image(struct RenderEngine *re, struct Depsgraph *depsgraph);
+ void DRW_render_to_image(struct RenderEngine *engine, struct Depsgraph *graph);
 +void DRW_render_gpencil_to_image(struct RenderEngine *engine, struct RenderLayer *render_layer, const rcti *rect);
  void DRW_render_object_iter(
  	void *vedata, struct RenderEngine *engine, struct Depsgraph *graph,
  	void (*callback)(void *vedata, struct Object *ob, struct RenderEngine *engine, struct Depsgraph *graph));
diff --cc source/blender/draw/intern/draw_manager.c
index 7255280d998,bf8428d2919..25ad53e98ac
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -3774,33 -1284,18 +1318,18 @@@ void DRW_render_to_image(RenderEngine *
  	     render_view = render_view->next)
  	{
  		RE_SetActiveRenderView(render, render_view->name);
- 		for (RenderLayer *render_layer = render_result->layers.first;
- 			 render_layer != NULL;
- 			 render_layer = render_layer->next)
- 		{
- 			ViewLayer *view_layer = BLI_findstring(&scene->view_layers, render_layer->name, offsetof(ViewLayer, name));
- 			DST.draw_ctx.view_layer = view_layer;
- 
- 			/* TODO(dfelinto/sergey) we should not get depsgraph from scene.
- 			 * 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_layer, &render_rect);
- 
- 			/* grease pencil: render result is merged in the previous render result. */
- 			DRW_render_gpencil_to_image(engine, render_layer, &render_rect);
- 			DST.buffer_finish_called = false;
- 			/* Force cache to reset. */
- 			drw_viewport_cache_resize();
- 		}
+ 		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_layer, &render_rect);
+ 		DST.buffer_finish_called = false;
  	}
  
  	RE_engine_end_result(engine, render_result, false, false, false);
  
- 	DST.buffer_finish_called = false;
+ 	/* Force cache to reset. */
+ 	drw_viewport_cache_resize();
  
 -	/* TODO grease pencil */
 -
  	GPU_viewport_free(DST.viewport);
- 	MEM_freeN(DST.viewport);
  
  	DRW_state_reset();
  	/* FIXME GL_DEPTH_TEST is enabled by default but it seems