From cb67be3f22c4d139ad43d6863ceea168d7872070 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 15 Nov 2017 13:29:40 -0200 Subject: Bitflag tests simplification --- source/blender/blenloader/intern/versioning_280.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'source/blender/blenloader') 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)) { -- cgit v1.2.3