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:
authorClément Foucault <foucault.clem@gmail.com>2020-08-22 02:30:15 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-08-22 02:42:15 +0300
commita2043249664d0f0be246a2e0e6d12bb062005b06 (patch)
treea61eb19355c085fd13f786003eca3405ca8ed66e /source/blender/draw/intern/draw_manager_exec.c
parenta1f54be0426e1fea3a24de9e853e2e802ea3b475 (diff)
DRW: Fix state not being locked
Regression introduced by rBe12c08e8d170b7ca40f204a5b0423c23a9fbc2c1
Diffstat (limited to 'source/blender/draw/intern/draw_manager_exec.c')
-rw-r--r--source/blender/draw/intern/draw_manager_exec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index 2223ae6c313..b3e1258ff7f 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -78,6 +78,9 @@ typedef struct DRWCommandsState {
void drw_state_set(DRWState state)
{
+ /* Mask locked state. */
+ state = (~DST.state_lock & state) | (DST.state_lock & DST.state);
+
if (DST.state == state) {
return;
}