[Bf-blender-cvs] [aa578fba534] blender2.8: Unittests: Workaround for basact->object.id.name written as DATA

[Dalai Felinto]

Commit: aa578fba534d7d7cab215d8f57c478d641b05db7
Author: Dalai Felinto
Date:   Mon Jul 17 15:03:35 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBaa578fba534d7d7cab215d8f57c478d641b05db7

Unittests: Workaround for basact->object.id.name written as DATA

This was introduced on e7fb013a60dd. Although I would love to investigate the
issue I'm mostly concerned with gettings the tests working again.

===================================================================

M	tests/python/render_layer/render_layer_common.py

===================================================================

diff --git a/tests/python/render_layer/render_layer_common.py b/tests/python/render_layer/render_layer_common.py
index 1173c1e4f36..84691ff3b3f 100644
--- a/tests/python/render_layer/render_layer_common.py
+++ b/tests/python/render_layer/render_layer_common.py
@@ -55,9 +55,17 @@ 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')
 
+    # There is a bug in blender where basact->object is saved as DATA*
+    # introduced on rBe7fb013a60dd
+
+    active_object = layer.get((b'basact', b'object', b'id', b'name'))
+    if active_object.startswith('DATA'):
+        data['active_object'] = ""
+    else:
+        data['active_object'] = active_object[2:]
+
     objects = []
     for link in linkdata_iter(layer, b'object_bases'):
         ob = link.get_pointer(b'object')