[Bf-blender-cvs] [f04c06498bd] blender2.8: Fix layers unittest - we cannot use nestted get_pointer calls

Dalai Felinto noreply at git.blender.org
Mon Jul 17 18:46:23 CEST 2017


Commit: f04c06498bd3bfc439cbcf35297a09112f8610b6
Author: Dalai Felinto
Date:   Mon Jul 17 18:44:33 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBf04c06498bd3bfc439cbcf35297a09112f8610b6

Fix layers unittest - we cannot use nestted get_pointer calls

Remember to update your //lib/tests folder as well.

Patch by Bastien Montagne(mont29)

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

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..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')




More information about the Bf-blender-cvs mailing list