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:
authorDalai Felinto <dfelinto@gmail.com>2017-11-10 16:26:35 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-11-10 16:27:30 +0300
commit34c99ee85b8d5a721a12bff2f82701f4bd95e5cd (patch)
treee3908bf33dab70dcebef54d2c64918f0970f967f /source/blender/blenloader/intern
parent2ec01cc7c59f52e22bbd2f8f783af9365f22349d (diff)
Fixup for doversion/layers: disable collections for scene layers
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r--source/blender/blenloader/intern/versioning_280.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 72e7aa3cc2f..09744f54170 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -320,7 +320,7 @@ void do_versions_after_linking_280(Main *main)
/* Add new collection bases. */
for (int layer = 0; layer < 20; layer++) {
- if ((srl->lay & (1 << layer)) != 0) {
+ if ((srl->lay & (1 << layer)) && (scene->lay & (1 << layer))) {
if (collections[DO_VERSION_COLLECTION_VISIBLE].created & (1 << layer)) {
LayerCollection *layer_collection_parent;