[Bf-blender-cvs] [752a2f096d8] temp-drawcontext: Merge remote-tracking branch 'origin/blender2.8' into temp-drawcontext

[Clément Foucault]

Commit: 752a2f096d8f5a8680e2822c62d4ea86bb8418e7
Author: Clément Foucault
Date:   Wed Feb 21 15:38:52 2018 +0100
Branches: temp-drawcontext
https://developer.blender.org/rB752a2f096d8f5a8680e2822c62d4ea86bb8418e7

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

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



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

diff --cc source/blender/draw/intern/draw_manager.c
index 56fa9608474,5299fa04e4e..1accd67cb47
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -3615,20 -3612,14 +3621,19 @@@ void DRW_draw_render_loop_offscreen
  	GPU_offscreen_bind(ofs, false);
  }
  
- void DRW_render_to_image(RenderEngine *re, struct Depsgraph *depsgraph)
+ void DRW_render_to_image(RenderEngine *engine, struct Depsgraph *depsgraph)
  {
  	Scene *scene = DEG_get_evaluated_scene(depsgraph);
- 	ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph);
- 	RenderEngineType *engine_type = re->type;
+ 	RenderEngineType *engine_type = engine->type;
  	DrawEngineType *draw_engine_type = engine_type->draw_engine;
  	RenderData *r = &scene->r;
- 	Render *render = re->re;
+ 	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));
diff --cc source/blender/windowmanager/intern/wm_window.c
index 3360529aa05,3268841334d..88a459852b5
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@@ -481,9 -489,11 +489,11 @@@ static void wm_window_ghostwindow_add(w
  #endif
  	                              GHOST_kDrawingContextTypeOpenGL,
  	                              glSettings);
 -	
 +
  	if (ghostwin) {
  		GHOST_RectangleHandle bounds;
+ 
+ 		win->gwnctx = GWN_context_create();
  		
  		/* the new window has already been made drawable upon creation */
  		wm->windrawable = win;