[Bf-blender-cvs] [9786e904f3a] temp-render-depsgraph: Merge remote-tracking branch 'origin/blender2.8' into temp-render-depsgraph

[Dalai Felinto]

Commit: 9786e904f3aa310e2f2dd646ca02b2ef6ce367ba
Author: Dalai Felinto
Date:   Fri Feb 23 16:16:50 2018 -0300
Branches: temp-render-depsgraph
https://developer.blender.org/rB9786e904f3aa310e2f2dd646ca02b2ef6ce367ba

Merge remote-tracking branch 'origin/blender2.8' into temp-render-depsgraph

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



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

diff --cc source/blender/draw/intern/draw_manager.c
index f757ec9271f,ac782a9541d..8aa4cc80fee
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -3669,15 -3669,14 +3672,15 @@@ void DRW_render_to_image(RenderEngine *
  			 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;
 +			BKE_scene_graph_update_tagged(&render_layer->eval_ctx,
 +			                              render_layer->depsgraph,
 +			                              bmain,
 +			                              scene,
 +			                              render_layer->eval_ctx.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);
 +			drw_eval_ctx_to_draw_ctx(&render_layer->eval_ctx);
  
- 			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);
  			DST.buffer_finish_called = false;
  			/* Force cache to reset. */
  			drw_viewport_cache_resize();
diff --cc source/blender/makesrna/intern/rna_depsgraph.c
index 77ad4f43b72,e6e1c714008..4fbb7782e47
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@@ -34,10 -34,9 +34,11 @@@
  
  #include "rna_internal.h"
  
++#include "DNA_object_types.h"
++
  #include "DEG_depsgraph.h"
 +#include "DEG_depsgraph_query.h"
  
--#include "DNA_object_types.h"
  
  #define STATS_MAX_SIZE 16384