From 9ce2370ce4f1e1e9bf14feaf56eee82bec9474ff Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Tue, 14 Nov 2017 16:18:14 -0200 Subject: SceneRenderLayer > SceneLayer: Remove exclude_layer Note: It is up to Cycles to still get rid of exclude_layer internally: RenderLayerInfo.exclude_layer --- source/blender/blenloader/intern/versioning_280.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/blenloader') diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 7ce7ef54040..31b90254916 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -321,7 +321,10 @@ void do_versions_after_linking_280(Main *main) /* Add new collection bases. */ for (int layer = 0; layer < 20; layer++) { - if ((srl->lay & (1 << layer)) && (scene->lay & (1 << layer))) { + if ((scene->lay & (1 << layer)) && + (srl->lay & (1 << layer)) && + ((srl->lay_exclude & (1 << layer)) == 0)) + { if (collections[DO_VERSION_COLLECTION_VISIBLE].created & (1 << layer)) { LayerCollection *layer_collection_parent; -- cgit v1.2.3