Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGermano <germano.costa@ig.com.br>2018-03-08 02:05:51 +0300
committerGermano <germano.costa@ig.com.br>2018-03-08 02:05:51 +0300
commit8d8f7e52c1dbf7e7c56eb212ff9e934131fdaf83 (patch)
treea57eccfe25a507e89c78c6af9489945ee17208a0 /source/blender/draw/intern
parentfef1b0155309ea50674ef6726061e42547b6a608 (diff)
Make sure that the WM_opengl_context_create is always called on the main thread
Avoid the error 170 ("The requested resource is in use").
Diffstat (limited to 'source/blender/draw/intern')
-rw-r--r--source/blender/draw/intern/draw_manager.c1
-rw-r--r--source/blender/draw/intern/draw_manager_shader.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 155547f1224..53dfa429abf 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1952,7 +1952,6 @@ void DRW_engines_free(void)
void DRW_opengl_context_create(void)
{
BLI_assert(DST.ogl_context == NULL); /* Ensure it's called once */
- BLI_assert(BLI_thread_is_main());
BLI_mutex_init(&DST.ogl_context_mutex);
diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c
index c898021ebd7..69c13bb61c2 100644
--- a/source/blender/draw/intern/draw_manager_shader.c
+++ b/source/blender/draw/intern/draw_manager_shader.c
@@ -200,7 +200,6 @@ static void drw_deferred_shader_add(
BLI_addtail(&comp->queue, dsh);
/* Create one context per task. */
- BLI_assert(BLI_thread_is_main());
comp->ogl_context = WM_opengl_context_create();
WM_opengl_context_activate(DST.ogl_context);