From a2043249664d0f0be246a2e0e6d12bb062005b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= <foucault.clem@gmail.com>
Date: Sat, 22 Aug 2020 01:30:15 +0200
Subject: DRW: Fix state not being locked

Regression introduced by rBe12c08e8d170b7ca40f204a5b0423c23a9fbc2c1
---
 source/blender/draw/intern/draw_manager_exec.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source')

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;
   }
-- 
cgit v1.2.3