[Bf-blender-cvs] [ccea4d13b3a] temp-eeveelightcache: DRW: Fix typos leading to locks and crashes.

Clément Foucault noreply at git.blender.org
Fri Jun 15 18:03:20 CEST 2018


Commit: ccea4d13b3aa4349e403ae01046aea48b156f8f2
Author: Clément Foucault
Date:   Fri Jun 15 17:58:29 2018 +0200
Branches: temp-eeveelightcache
https://developer.blender.org/rBccea4d13b3aa4349e403ae01046aea48b156f8f2

DRW: Fix typos leading to locks and crashes.

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

M	source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 4db5f3942e1..186ee2dfecb 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1472,7 +1472,7 @@ void DRW_render_to_image(RenderEngine *engine, struct Depsgraph *depsgraph)
 		DRW_opengl_render_context_enable(re_gl_context);
 		/* We need to query gwn context after a gl context has been bound. */
 		re_gwn_context = RE_gwn_context_get(render);
-		DRW_opengl_render_context_enable(re_gwn_context);
+		DRW_gawain_render_context_enable(re_gwn_context);
 	}
 	else {
 		DRW_opengl_context_enable();
@@ -1551,8 +1551,8 @@ void DRW_render_to_image(RenderEngine *engine, struct Depsgraph *depsgraph)
 
 	/* Changing Context */
 	if (re_gl_context != NULL) {
-		DRW_gawain_render_context_disable(re_gl_context);
-		DRW_opengl_render_context_disable(re_gwn_context);
+		DRW_gawain_render_context_disable(re_gwn_context);
+		DRW_opengl_render_context_disable(re_gl_context);
 	}
 	else {
 		DRW_opengl_context_disable();



More information about the Bf-blender-cvs mailing list