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 19:06:49 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-07-17 19:06:49 +0300
commit0e49d5376cb127fa3baad2e0d4a09a41e32a8be1 (patch)
tree82a9bb8845a847f190fa7af1e7811a52523b7f34 /tests/python/render_layer
parentaa578fba534d7d7cab215d8f57c478d641b05db7 (diff)
Revert "Unittests: Workaround for basact->object.id.name written as DATA"
This reverts commit aa578fba534d7d7cab215d8f57c478d641b05db7.
Diffstat (limited to 'tests/python/render_layer')
-rw-r--r--tests/python/render_layer/render_layer_common.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/python/render_layer/render_layer_common.py b/tests/python/render_layer/render_layer_common.py
index 84691ff3b3f..1173c1e4f36 100644
--- a/tests/python/render_layer/render_layer_common.py
+++ b/tests/python/render_layer/render_layer_common.py
@@ -55,17 +55,9 @@ 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')