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:
authorCampbell Barton <ideasman42@gmail.com>2018-03-02 14:53:01 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-03-02 14:53:01 +0300
commit437801bec1f4140b255927e6e6c957fa5b453014 (patch)
treec43ae3bf24cf2bdb407a114541de285700609fca /source/blender/draw/intern/draw_manager_exec.c
parente1f1567b5657190d2da2d4a8df49995e0e515d0c (diff)
Correct draw manager locking flag check
Error in eeae50fc1c8, thanks @mano-wii for spotting
Diffstat (limited to 'source/blender/draw/intern/draw_manager_exec.c')
-rw-r--r--source/blender/draw/intern/draw_manager_exec.c6
1 files changed, 3 insertions, 3 deletions
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))) && \