Commit: e30f25ba22efae0c749c3dcecf6fb4ecf60e853e
Author: Clément Foucault
Date: Tue Jul 3 12:32:01 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe30f25ba22efae0c749c3dcecf6fb4ecf60e853e
GHOST: Fix assert and rebind previous ogl context.
===================================================================
M intern/gawain/src/gwn_vertex_array_id.cpp
M source/blender/render/intern/source/pipeline.c
===================================================================
diff --git a/intern/gawain/src/gwn_vertex_array_id.cpp
b/intern/gawain/src/gwn_vertex_array_id.cpp
index ad60dea7542..5294c6c8e23 100644
--- a/intern/gawain/src/gwn_vertex_array_id.cpp
+++ b/intern/gawain/src/gwn_vertex_array_id.cpp
@@ -68,7 +68,7 @@ static void clear_orphans(Gwn_Context* ctx)
Gwn_Context* GWN_context_create(void)
{
#if TRUST_NO_ONE
- assert(thread_is_main());
+ // assert(thread_is_main());
#endif
Gwn_Context* ctx = new Gwn_Context;
glGenVertexArrays(1, &ctx->default_vao);
diff --git a/source/blender/render/intern/source/pipeline.c
b/source/blender/render/intern/source/pipeline.c
index 361324bf07c..82595527d30 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -64,6 +64,7 @@
#include "BKE_animsys.h" /* <------ should this be here?, needed for
sequencer update */
#include "BKE_camera.h"
#include "BKE_colortools.h"
+#include "BKE_context.h" /* XXX needed by wm_window.h */
#include "BKE_global.h"
#include "BKE_image.h"
#include "BKE_layer.h"
@@ -95,6 +96,7 @@
#include "RE_render_ext.h"
#include "../../../windowmanager/WM_api.h" /* XXX */
+#include "../../../windowmanager/wm_window.h" /* XXX */
#include "../../../intern/gawain/gawain/gwn_context.h"
#ifdef WITH_FREESTYLE
@@ -1034,6 +1036,8 @@ void RE_gl_context_create(Render *re)
{
/* Needs to be created in the main ogl thread. */
re->gl_context = WM_opengl_context_create();
+ /* So we activate the window's one afterwards. */
+ wm_window_reset_drawable();
}
void RE_gl_context_destroy(Render *re)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
