[Bf-blender-cvs] [437801bec1f] blender2.8: Correct draw manager locking flag check

[Campbell Barton]

Commit: 437801bec1f4140b255927e6e6c957fa5b453014
Author: Campbell Barton
Date:   Fri Mar 2 22:53:01 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB437801bec1f4140b255927e6e6c957fa5b453014

Correct draw manager locking flag check

Error in eeae50fc1c8, thanks @mano-wii for spotting

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

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 bc527d0337c..0cdf5d78a43 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -61,10 +61,10 @@ void drw_state_set(DRWState state)
 	}
 
 #define CHANGED_TO(f) \
-	((((DST.state & (f)) ? \
+	((DST.state_lock & (f)) ? 0 : \
+	 (((DST.state & (f)) ? \
 	   ((state & (f)) ?  0 : -1) : \
-	   ((state & (f)) ?  1 :  0))) && \
-	 ((DST.state_lock & (f)) == 0))
+	   ((state & (f)) ?  1 :  0))))
 
 #define CHANGED_ANY(f) \
 	(((DST.state & (f)) != (state & (f))) && \