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-12-14 16:46:49 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-12-15 13:56:48 +0300
commit1f5106de610b115b87ab6121d7871d447ca48cd2 (patch)
treed929ef94556eac6063c24983cc6b89f52075701c /tests/python/view_layer/test_scene_copy_f.py
parent7402b8ec74b4f74371d92816d22869ec9bd95da4 (diff)
Group collection viewport/render options and remove collection visibility
Users can change the group collection visibility in the outliner when looking at groups. Regular collections on the other hand don't have any special visibility control, if you need a collection to be invisible during render, either don't link it into the view layer used for F12, or disable it. This includes: * Updated unittests - update your lib/tests/layers folder. * Subversion bump - branches be aware of that. Note: Although we are using eval_ctx to determine the visibility of a group collection when rendering, the depsgraph is still using the same depsgraph for the viewport and the render engine, so at the moment the render visibility is ignored. Following next is a workaround for this separately to tag the groups before and after rendering to tackle that.
Diffstat (limited to 'tests/python/view_layer/test_scene_copy_f.py')
-rw-r--r--tests/python/view_layer/test_scene_copy_f.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/python/view_layer/test_scene_copy_f.py b/tests/python/view_layer/test_scene_copy_f.py
index 726861df9ba..f97eec3b98a 100644
--- a/tests/python/view_layer/test_scene_copy_f.py
+++ b/tests/python/view_layer/test_scene_copy_f.py
@@ -24,11 +24,11 @@ class UnitTesting(ViewLayerTesting):
scene = bpy.context.scene
- hide_lookup = [0, 1, 1, 0]
- hide_lookup_sub = [1, 0, 1]
+ enabled_lookup = [True, False, False, True]
+ enabled_lookup_sub = [False, True, False]
- hide_select_lookup = [0, 0, 1, 1]
- hide_select_lookup_sub = [1, 0, 1, 0]
+ selectable_lookup = [True, True, False, False]
+ selectable_lookup_sub = [False, True, False, True]
new_collections = []
# clean everything
@@ -50,12 +50,12 @@ class UnitTesting(ViewLayerTesting):
layer.collections.link(collection)
self.assertEqual(layer.collections[-1], layer.collections[i])
- layer.collections[i].hide = hide_lookup[i]
- layer.collections[i].hide_select = hide_select_lookup[i]
+ layer.collections[i].enabled = enabled_lookup[i]
+ layer.collections[i].selectable = selectable_lookup[i]
for j, sub_collection in enumerate(layer.collections[i].collections):
- sub_collection.hide = hide_lookup_sub[j]
- sub_collection.hide_select = hide_select_lookup_sub[j]
+ sub_collection.enabled = enabled_lookup_sub[j]
+ sub_collection.selectable = selectable_lookup_sub[j]
# copy scene
bpy.ops.scene.new(type='FULL_COPY')
@@ -71,13 +71,13 @@ class UnitTesting(ViewLayerTesting):
for i, collection in enumerate(layer.collections):
new_collection = new_layer.collections[i]
- self.assertEqual(collection.hide, new_collection.hide)
- self.assertEqual(collection.hide_select, new_collection.hide_select)
+ self.assertEqual(collection.enabled, new_collection.enabled)
+ self.assertEqual(collection.selectable, new_collection.selectable)
for j, sub_collection in enumerate(layer.collections[i].collections):
new_sub_collection = new_collection.collections[j]
- self.assertEqual(sub_collection.hide, new_sub_collection.hide)
- self.assertEqual(sub_collection.hide_select, new_sub_collection.hide_select)
+ self.assertEqual(sub_collection.enabled, new_sub_collection.enabled)
+ self.assertEqual(sub_collection.selectable, new_sub_collection.selectable)
# ############################################################