[Bf-blender-cvs] [34c99ee85b8] blender2.8: Fixup for doversion/layers: disable collections for scene layers

Dalai Felinto noreply at git.blender.org
Fri Nov 10 14:28:21 CET 2017


Commit: 34c99ee85b8d5a721a12bff2f82701f4bd95e5cd
Author: Dalai Felinto
Date:   Fri Nov 10 11:26:35 2017 -0200
Branches: blender2.8
https://developer.blender.org/rB34c99ee85b8d5a721a12bff2f82701f4bd95e5cd

Fixup for doversion/layers: disable collections for scene layers

===================================================================

M	source/blender/blenloader/intern/versioning_280.c

===================================================================

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;



More information about the Bf-blender-cvs mailing list