Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-07-17 16:03:35 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-07-17 17:22:42 +0300
commitaa578fba534d7d7cab215d8f57c478d641b05db7 (patch)
tree567174debe8376a1bf4ae1929eb191fd6cc53121 /tests/python/render_layer/render_layer_common.py
parenta258c5d3253316b947fa1db0e80deb82350b8cd3 (diff)
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.
Diffstat (limited to 'tests/python/render_layer/render_layer_common.py')
-rw-r--r--tests/python/render_layer/render_layer_common.py10
1 files changed, 9 insertions, 1 deletions
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')