diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-14 21:18:14 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 12:13:33 +0300 |
| commit | 9ce2370ce4f1e1e9bf14feaf56eee82bec9474ff (patch) | |
| tree | d619104ca32c41509a26fd41112ac239674f424b /source/blender/blenloader | |
| parent | 846cdf53187174ac87dd24af4b7b0d413db4ad03 (diff) | |
SceneRenderLayer > SceneLayer: Remove exclude_layer
Note: It is up to Cycles to still get rid of exclude_layer internally:
RenderLayerInfo.exclude_layer
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |