blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix failing render-layer tests after workpsace commit

This commit is contained in:
Julian Eisel 2017-06-09 19:25:06 +02:00
parent ebb2c1511b
commit da30509725
14 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/python/render_layer/render_layer_common.py
View File

@ -747,7 +747,7 @@ class Clay:
layer = self._scene.render_layers.new('Evaluation Test')
layer.collections.unlink(layer.collections[0])
self._scene.render_layers.active = layer
bpy.context.workspace.render_layer = layer
# remove all other layers
for layer_iter in self._scene.render_layers:

3
tests/python/render_layer/test_evaluation_selectability_a.py
View File

@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.render_layers.new('Selectability Test')
layer.collections.unlink(layer.collections[0])
scene.render_layers.active = layer
workspace.render_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

3
tests/python/render_layer/test_evaluation_selectability_b.py
View File

@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.render_layers.new('Selectability Test')
layer.collections.unlink(layer.collections[0])
scene.render_layers.active = layer
workspace.render_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

3
tests/python/render_layer/test_evaluation_selectability_c.py
View File

@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.render_layers.new('Selectability Test')
layer.collections.unlink(layer.collections[0])
scene.render_layers.active = layer
workspace.render_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

3
tests/python/render_layer/test_evaluation_selectability_d.py
View File

@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.render_layers.new('Selectability Test')
layer.collections.unlink(layer.collections[0])
scene.render_layers.active = layer
workspace.render_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

3
tests/python/render_layer/test_evaluation_selectability_e.py
View File

@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.render_layers.new('Selectability Test')
layer.collections.unlink(layer.collections[0])
scene.render_layers.active = layer
workspace.render_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

3
tests/python/render_layer/test_evaluation_visibility_a.py
View File

@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.render_layers.new('Visibility Test')
layer.collections.unlink(layer.collections[0])
scene.render_layers.active = layer
workspace.render_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene.master_collection.collections.new("Kid")

3
tests/python/render_layer/test_evaluation_visibility_b.py
View File

@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.render_layers.new('Visibility Test')
layer.collections.unlink(layer.collections[0])
scene.render_layers.active = layer
workspace.render_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

3
tests/python/render_layer/test_evaluation_visibility_c.py
View File

@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.render_layers.new('Visibility Test')
layer.collections.unlink(layer.collections[0])
scene.render_layers.active = layer
workspace.render_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

3
tests/python/render_layer/test_evaluation_visibility_d.py
View File

@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.render_layers.new('Visibility Test')
layer.collections.unlink(layer.collections[0])
scene.render_layers.active = layer
workspace.render_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

3
tests/python/render_layer/test_evaluation_visibility_e.py
View File

@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.render_layers.new('Visibility Test')
layer.collections.unlink(layer.collections[0])
scene.render_layers.active = layer
workspace.render_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

3
tests/python/render_layer/test_evaluation_visibility_f.py
View File

@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.render_layers.new('Visibility Test')
layer.collections.unlink(layer.collections[0])
scene.render_layers.active = layer
workspace.render_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

2
tests/python/render_layer/test_object_link_b.py
View File

@ -19,7 +19,7 @@ class UnitTesting(RenderLayerTesting):
See if we can link objects via bpy.context.scene_collection
"""
import bpy
bpy.context.scene.render_layers.active_index = len(bpy.context.scene.render_layers) - 1
bpy.context.workspace.render_layer = bpy.context.scene.render_layers['Viewport']
master_collection = bpy.context.scene_collection
self.do_object_link(master_collection)

4
tests/python/render_layer/test_operator_context.py
View File

@ -88,9 +88,7 @@ class UnitTesting(RenderLayerTesting):
layer.collections.active_index = 3
self.assertEqual(layer.collections.active.name, 'scorpion')
scene = bpy.context.scene
scene.render_layers.active_index = len(scene.render_layers) - 2
self.assertEqual(scene.render_layers.active.name, "Viewport")
bpy.context.workspace.render_layer = bpy.context.scene.render_layers['Viewport']
# old layer
self.assertEqual(bpy.ops.testing.sample(render_layer='Viewport', use_verbose=True), {'FINISHED'})