diff options
| author | Antonioya <blendergit@gmail.com> | 2018-06-21 17:10:52 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2018-06-21 17:11:29 +0300 |
| commit | c45a3b80e2356a952248eaafaeeec48b28bcb0fd (patch) | |
| tree | d82b50aa93606afb66ecf8df6ebe0d8adacb604e /source/blender/windowmanager | |
| parent | b350edc20750929ee132e5b78fa25221e893ffc3 (diff) | |
Fix T55555: Crash when select material properties
This error is only in Windows and Mac when select in properties the material tab.
This commit revert dc856be8399242f4ee3a2ce0450b7ac5a20b35f6 Preview: Add own opengl context to render preview images.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 5d4e52dad77..acc9a500247 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -2296,14 +2296,13 @@ void *WM_opengl_context_create(void) * So we should call this function only on the main thread. */ BLI_assert(BLI_thread_is_main()); - // BLI_assert(GPU_framebuffer_current_get() == 0); + BLI_assert(GPU_framebuffer_current_get() == 0); return GHOST_CreateOpenGLContext(g_system); } void WM_opengl_context_dispose(void *context) { - // BLI_assert(BLI_thread_is_main()); - // BLI_assert(GPU_framebuffer_current_get() == 0); + BLI_assert(GPU_framebuffer_current_get() == 0); GHOST_DisposeOpenGLContext(g_system, (GHOST_ContextHandle)context); } |