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
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-07-10 00:33:20 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-07-10 00:57:19 +0300
commit8373544df30a0e24b080a03c4d4c0b5108c4932d (patch)
tree70a25bd48e8573710aa9a14ba02b925644f125c3 /intern
parent845899d373df4fa5e692c828d6af151309169c87 (diff)
Fix T55776: crash with multiple windows and reload new.
There were a number of cases where immActivate() and immDeactivate() could get out of sync, causing crashes due to using a freed mutex lock. Refactor the code now to hopefully avoid this always.
Diffstat (limited to 'intern')
-rw-r--r--intern/gawain/src/gwn_immediate.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/intern/gawain/src/gwn_immediate.c b/intern/gawain/src/gwn_immediate.c
index c57564fce06..d43e52cc525 100644
--- a/intern/gawain/src/gwn_immediate.c
+++ b/intern/gawain/src/gwn_immediate.c
@@ -77,8 +77,6 @@ void immInit(void)
glBindBuffer(GL_ARRAY_BUFFER, 0);
initialized = true;
-
- immActivate();
}
void immActivate(void)
@@ -106,7 +104,6 @@ void immDeactivate(void)
void immDestroy(void)
{
- immDeactivate();
GWN_buf_id_free(imm.vbo_id);
initialized = false;
}