Unittests: Make sure layer tests pass with or without workspace

tests/python/render_layer/render_layer_common.py

@@ -747,6 +747,7 @@ class Clay:
 
         layer = self._scene.render_layers.new('Evaluation Test')
         layer.collections.unlink(layer.collections[0])
+        self._scene.render_layers.active = layer
         bpy.context.workspace.render_layer = layer
 
         # remove all other layers

tests/python/render_layer/test_evaluation_selectability_a.py

@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Selectability Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")

tests/python/render_layer/test_evaluation_selectability_b.py

@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Selectability Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")

tests/python/render_layer/test_evaluation_selectability_c.py

@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Selectability Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")

tests/python/render_layer/test_evaluation_selectability_d.py

@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Selectability Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")

tests/python/render_layer/test_evaluation_selectability_e.py

@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Selectability Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")

tests/python/render_layer/test_evaluation_visibility_a.py

@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Visibility Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")

tests/python/render_layer/test_evaluation_visibility_b.py

@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Visibility Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")

tests/python/render_layer/test_evaluation_visibility_c.py

@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Visibility Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")

tests/python/render_layer/test_evaluation_visibility_d.py

@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Visibility Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")

tests/python/render_layer/test_evaluation_visibility_e.py

@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Visibility Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")

tests/python/render_layer/test_evaluation_visibility_f.py

@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Visibility Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")

tests/python/render_layer/test_object_copy.py

@@ -42,6 +42,7 @@ class UnitTesting(RenderLayerTesting):
             layer.collections.link(subzero)
 
             scene.render_layers.active_index = len(scene.render_layers) - 1
+            bpy.context.workspace.render_layer = bpy.context.scene.render_layers['Fresh new Layer']
 
             if mode == 'DUPLICATE':
                 # assuming the latest layer is the active layer

tests/python/render_layer/test_object_link_b.py

@@ -19,6 +19,7 @@ class UnitTesting(RenderLayerTesting):
         See if we can link objects via bpy.context.scene_collection
         """
         import bpy
+        bpy.context.scene.render_layers.active_index = len(bpy.context.scene.render_layers) - 1
         bpy.context.workspace.render_layer = bpy.context.scene.render_layers['Viewport']
         master_collection = bpy.context.scene_collection
         self.do_object_link(master_collection)

tests/python/render_layer/test_operator_context.py

@@ -88,6 +88,10 @@ class UnitTesting(RenderLayerTesting):
         layer.collections.active_index = 3
         self.assertEqual(layer.collections.active.name, 'scorpion')
 
+        # Change active scene layer (do it for workspace too just to don't get mangled in workspace bugs)
+        scene = bpy.context.scene
+        scene.render_layers.active_index = len(scene.render_layers) - 2
+        self.assertEqual(scene.render_layers.active.name, "Viewport")
         bpy.context.workspace.render_layer = bpy.context.scene.render_layers['Viewport']
 
         # old layer