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
path: root/tests
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-07-17 19:44:33 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-07-17 19:46:00 +0300
commitf04c06498bd3bfc439cbcf35297a09112f8610b6 (patch)
treee7cb6e883a6eba30d415a83d154424e208f2b62b /tests
parent0e49d5376cb127fa3baad2e0d4a09a41e32a8be1 (diff)
Fix layers unittest - we cannot use nestted get_pointer calls
Remember to update your //lib/tests folder as well. Patch by Bastien Montagne(mont29)
Diffstat (limited to 'tests')
-rw-r--r--tests/python/render_layer/render_layer_common.py8
1 files changed, 7 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..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')