[Bf-blender-cvs] [99e236e4d20] temp-eeveelightcache: Merge remote-tracking branch 'origin/blender2.8' into temp-eeveelightcache

[Clément Foucault]

Commit: 99e236e4d205b230a2aeb2100302052cc85ee681
Author: Clément Foucault
Date:   Fri Jun 15 12:38:25 2018 +0200
Branches: temp-eeveelightcache
https://developer.blender.org/rB99e236e4d205b230a2aeb2100302052cc85ee681

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

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



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

diff --cc source/blender/draw/intern/draw_manager.c
index b8b3fe3a36e,a91b9fad35e..4db5f3942e1
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -1544,10 -1548,19 +1544,15 @@@ void DRW_render_to_image(RenderEngine *
  	GPU_viewport_free(DST.viewport);
  	GPU_framebuffer_restore();
  
+ #ifdef DEBUG
+ 	/* Avoid accidental reuse. */
+ 	drw_state_ensure_not_reused(&DST);
+ #endif
+ 
  	/* Changing Context */
  	if (re_gl_context != NULL) {
 -		DRW_shape_cache_reset(); /* XXX fix that too. */
 -		glFlush();
 -		GWN_context_active_set(NULL);
 -		WM_opengl_context_release(re_gl_context);
 -		/* TODO get rid of the blocking. */
 -		BLI_mutex_unlock(&DST.gl_context_mutex);
 +		DRW_gawain_render_context_disable(re_gl_context);
 +		DRW_opengl_render_context_disable(re_gwn_context);
  	}
  	else {
  		DRW_opengl_context_disable();