diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-15 18:29:40 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 12:13:33 +0300 |
| commit | cb67be3f22c4d139ad43d6863ceea168d7872070 (patch) | |
| tree | 1f23a1c9665cbbe28b44ab341b86a2a4237640e5 /source/blender/blenloader | |
| parent | d276e45ee6c2ae6d67177552f4c5f27cd99bdd83 (diff) | |
Bitflag tests simplification
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 44ce2014e99..8d057330822 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -330,14 +330,8 @@ void do_versions_after_linking_280(Main *main) /* Add new collection bases. */ for (int layer = 0; layer < 20; layer++) { - if (( - (scene->lay & (1 << layer)) && - (srl->lay & (1 << layer)) && - ((srl->lay_exclude & (1 << layer)) == 0)) || - ( - (srl->lay_zmask & (1 << layer)) && - ((scene->lay | srl->lay_exclude) & (1 << layer))) - ) + if ((scene->lay & srl->lay & ~(srl->lay_exclude) & (1 << layer)) || + (srl->lay_zmask & (scene->lay | srl->lay_exclude) & (1 << layer))) { if (collections[DO_VERSION_COLLECTION_VISIBLE].created & (1 << layer)) { |