diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-07-03 16:07:14 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-07-03 16:18:46 +0300 |
| commit | d97c3bc7ad13cb9e3ec2248ce035a62c28ac70f8 (patch) | |
| tree | 6dc5b6169e1398b4dc53f5aefc7304cb13ccbcda /source/blender/blenkernel/intern/sequencer.c | |
| parent | 871325e26fe12efe8bf8a7042d94896f2f7faf6c (diff) | |
| parent | eb1532a86094ba5d59bf62b1fbd50f74a639d0a8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index e316b7f26e9..bebd3d64b44 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -2084,7 +2084,7 @@ void BKE_sequencer_proxy_set(struct Sequence *seq, bool value) } } else { - seq->flag ^= SEQ_USE_PROXY; + seq->flag &= ~SEQ_USE_PROXY; } } |