Layers doversion: Don't set the Viewport created layer as renderable

1 files changed, 4 insertions, 0 deletions

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 1be4402012d..e331c285176 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -421,6 +421,10 @@ void do_versions_after_linking_280(Main *main)
 				BLI_freelistN(&scene->r.layers);
 
 				SceneLayer *scene_layer = BKE_scene_layer_add(scene, "Viewport");
+				/* If we ported all the original render layers, we don't need to make the viewport layer renderable. */
+				if (BLI_listbase_is_single(&scene->render_layers)) {
+					scene_layer->flag &= ~SCENE_LAYER_RENDER;
+				}
 
 				/* If layer was not set, disable it. */
 				LayerCollection *layer_collection_parent;