Merge branch '28' into custom-manipulatorscustom-manipulators

1 files changed, 8 insertions, 1 deletions

diff --git a/tests/python/render_layer/render_layer_common.py b/tests/python/render_layer/render_layer_common.py
index f6e16459ed3..adc32f062ea 100644
--- a/tests/python/render_layer/render_layer_common.py
+++ b/tests/python/render_layer/render_layer_common.py
@@ -55,9 +55,15 @@ def get_layer(layer):
     name = layer.get(b'name')
 
     data['name'] = name
-    data['active_object'] = layer.get((b'basact', b'object', b'id', b'name'))[2:]
     data['engine'] = layer.get(b'engine')
 
+    active_base = layer.get_pointer(b'basact')
+    if active_base:
+        ob = active_base.get_pointer(b'object')
+        data['active_object'] = ob.get((b'id', b'name'))[2:]
+    else:
+        data['active_object'] = ""
+
     objects = []
     for link in linkdata_iter(layer, b'object_bases'):
         ob = link.get_pointer(b'object')
@@ -747,6 +753,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