[Bf-blender-cvs] [a2043249664] master: DRW: Fix state not being locked

[Clément Foucault]

Commit: a2043249664d0f0be246a2e0e6d12bb062005b06
Author: Clément Foucault
Date:   Sat Aug 22 01:30:15 2020 +0200
Branches: master
https://developer.blender.org/rBa2043249664d0f0be246a2e0e6d12bb062005b06

DRW: Fix state not being locked

Regression introduced by rBe12c08e8d170b7ca40f204a5b0423c23a9fbc2c1

===================================================================

M	source/blender/draw/intern/draw_manager_exec.c

===================================================================

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;
   }