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

[Dalai Felinto]

Commit: e149bd97729d602f4dc71702ee085ce113991657
Author: Dalai Felinto
Date:   Mon Feb 26 16:39:03 2018 -0300
Branches: temp-render-depsgraph
https://developer.blender.org/rBe149bd97729d602f4dc71702ee085ce113991657

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

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



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

diff --cc source/blender/draw/intern/draw_manager.c
index d8330308e90,3845ee6a65e..716d9fd46d7
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -3626,7 -3637,13 +3638,13 @@@ void DRW_render_to_image(RenderEngine *
  	DrawEngineType *draw_engine_type = engine_type->draw_engine;
  	RenderData *r = &scene->r;
  	Render *render = engine->re;
 -	const EvaluationContext *eval_ctx = RE_GetEvalCtx(render);
 +
+ 	/* Changing Context */
+ 	DRW_opengl_context_enable();
+ 	/* IMPORTANT: We dont support immediate mode in render mode!
+ 	 * This shall remain in effect until immediate mode supports
+ 	 * multiple threads. */
+ 
  	/* Reset before using it. */
  	memset(&DST, 0x0, sizeof(DST));
  	DST.options.is_image_render = true;