diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 15:52:39 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-23 12:48:23 +0300 |
| commit | 3abe8b3292cf7a50a9200b95401993384df24d9a (patch) | |
| tree | 6c7a853710f1a4264dd1bb4d7b9bf14f44b75f33 /tests/python | |
| parent | fb7d23bdb2a5c0ed00067045e4acdf6593258b52 (diff) | |
Rename any instance of scene layer or render layer in code with view layer
The RenderResult struct still has a listbase of RenderLayer, but that's ok
since this is strictly for rendering.
* Subversion bump (to 2.80.2)
* DNA low level doversion (renames) - only for .blend created since 2.80 started
Note: We can't use DNA_struct_elem_find or get file version in init_structDNA,
so we are manually iterating over the array of the SDNA elements instead.
Note 2: This doversion change with renames can be reverted in a few months. But
so far it's required for 2.8 files created between October 2016 and now.
Reviewers: campbellbarton, sergey
Differential Revision: https://developer.blender.org/D2927
Diffstat (limited to 'tests/python')
| -rw-r--r-- | tests/python/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/python/render_layer/CMakeLists.txt | 175 | ||||
| -rw-r--r-- | tests/python/view_layer/CMakeLists.txt | 175 | ||||
| -rw-r--r-- | tests/python/view_layer/test_active_collection.py (renamed from tests/python/render_layer/test_active_collection.py) | 6 | ||||
| -rw-r--r-- | tests/python/view_layer/test_collection_rename.py (renamed from tests/python/render_layer/test_collection_rename.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_render_settings_a.py (renamed from tests/python/render_layer/test_evaluation_render_settings_a.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_render_settings_b.py (renamed from tests/python/render_layer/test_evaluation_render_settings_b.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_render_settings_c.py (renamed from tests/python/render_layer/test_evaluation_render_settings_c.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_render_settings_d.py (renamed from tests/python/render_layer/test_evaluation_render_settings_d.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_render_settings_e.py (renamed from tests/python/render_layer/test_evaluation_render_settings_e.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_render_settings_f.py (renamed from tests/python/render_layer/test_evaluation_render_settings_f.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_render_settings_g.py (renamed from tests/python/render_layer/test_evaluation_render_settings_g.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_render_settings_h.py (renamed from tests/python/render_layer/test_evaluation_render_settings_h.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_render_settings_i.py (renamed from tests/python/render_layer/test_evaluation_render_settings_i.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_selectability_a.py (renamed from tests/python/render_layer/test_evaluation_selectability_a.py) | 10 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_selectability_b.py (renamed from tests/python/render_layer/test_evaluation_selectability_b.py) | 10 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_selectability_c.py (renamed from tests/python/render_layer/test_evaluation_selectability_c.py) | 10 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_selectability_d.py (renamed from tests/python/render_layer/test_evaluation_selectability_d.py) | 10 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_selectability_e.py (renamed from tests/python/render_layer/test_evaluation_selectability_e.py) | 10 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_selectability_f.py (renamed from tests/python/render_layer/test_evaluation_selectability_f.py) | 6 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_visibility_a.py (renamed from tests/python/render_layer/test_evaluation_visibility_a.py) | 10 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_visibility_b.py (renamed from tests/python/render_layer/test_evaluation_visibility_b.py) | 10 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_visibility_c.py (renamed from tests/python/render_layer/test_evaluation_visibility_c.py) | 10 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_visibility_d.py (renamed from tests/python/render_layer/test_evaluation_visibility_d.py) | 10 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_visibility_e.py (renamed from tests/python/render_layer/test_evaluation_visibility_e.py) | 10 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_visibility_f.py (renamed from tests/python/render_layer/test_evaluation_visibility_f.py) | 10 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_visibility_g.py (renamed from tests/python/render_layer/test_evaluation_visibility_g.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_visibility_h.py (renamed from tests/python/render_layer/test_evaluation_visibility_h.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_evaluation_visibility_i.py (renamed from tests/python/render_layer/test_evaluation_visibility_i.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_layer_linking.py (renamed from tests/python/render_layer/test_layer_linking.py) | 6 | ||||
| -rw-r--r-- | tests/python/view_layer/test_layer_syncing.py (renamed from tests/python/render_layer/test_layer_syncing.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_layer_collection_a.py (renamed from tests/python/render_layer/test_move_above_below_layer_collection_a.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_layer_collection_b.py (renamed from tests/python/render_layer/test_move_above_below_layer_collection_b.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_layer_collection_c.py (renamed from tests/python/render_layer/test_move_above_below_layer_collection_c.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_layer_collection_d.py (renamed from tests/python/render_layer/test_move_above_below_layer_collection_d.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_layer_collection_e.py (renamed from tests/python/render_layer/test_move_above_below_layer_collection_e.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_layer_collection_f.py (renamed from tests/python/render_layer/test_move_above_below_layer_collection_f.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_layer_collection_g.py (renamed from tests/python/render_layer/test_move_above_below_layer_collection_g.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_layer_collection_h.py (renamed from tests/python/render_layer/test_move_above_below_layer_collection_h.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_layer_collection_i.py (renamed from tests/python/render_layer/test_move_above_below_layer_collection_i.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_layer_collection_j.py (renamed from tests/python/render_layer/test_move_above_below_layer_collection_j.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_layer_collection_k.py (renamed from tests/python/render_layer/test_move_above_below_layer_collection_k.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_layer_collection_l.py (renamed from tests/python/render_layer/test_move_above_below_layer_collection_l.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_a.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_a.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_b.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_b.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_c.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_c.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_d.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_d.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_e.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_e.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_f.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_f.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_g.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_g.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_h.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_h.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_i.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_i.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_sync_a.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_sync_a.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_sync_b.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_sync_b.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_sync_c.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_sync_c.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_sync_d.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_sync_d.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_sync_e.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_sync_e.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_sync_f.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_sync_f.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_sync_g.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_sync_g.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_sync_h.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_sync_h.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_above_below_scene_collection_sync_i.py (renamed from tests/python/render_layer/test_move_above_below_scene_collection_sync_i.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_layer_collection_a.py (renamed from tests/python/render_layer/test_move_into_layer_collection_a.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_layer_collection_b.py (renamed from tests/python/render_layer/test_move_into_layer_collection_b.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_layer_collection_c.py (renamed from tests/python/render_layer/test_move_into_layer_collection_c.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_layer_collection_d.py (renamed from tests/python/render_layer/test_move_into_layer_collection_d.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_layer_collection_e.py (renamed from tests/python/render_layer/test_move_into_layer_collection_e.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_layer_collection_f.py (renamed from tests/python/render_layer/test_move_into_layer_collection_f.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_layer_collection_g.py (renamed from tests/python/render_layer/test_move_into_layer_collection_g.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_layer_collection_h.py (renamed from tests/python/render_layer/test_move_into_layer_collection_h.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_layer_collection_i.py (renamed from tests/python/render_layer/test_move_into_layer_collection_i.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_layer_collection_j.py (renamed from tests/python/render_layer/test_move_into_layer_collection_j.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_a.py (renamed from tests/python/render_layer/test_move_into_scene_collection_a.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_b.py (renamed from tests/python/render_layer/test_move_into_scene_collection_b.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_c.py (renamed from tests/python/render_layer/test_move_into_scene_collection_c.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_d.py (renamed from tests/python/render_layer/test_move_into_scene_collection_d.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_e.py (renamed from tests/python/render_layer/test_move_into_scene_collection_e.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_f.py (renamed from tests/python/render_layer/test_move_into_scene_collection_f.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_g.py (renamed from tests/python/render_layer/test_move_into_scene_collection_g.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_h.py (renamed from tests/python/render_layer/test_move_into_scene_collection_h.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_i.py (renamed from tests/python/render_layer/test_move_into_scene_collection_i.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_j.py (renamed from tests/python/render_layer/test_move_into_scene_collection_j.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_k.py (renamed from tests/python/render_layer/test_move_into_scene_collection_k.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_l.py (renamed from tests/python/render_layer/test_move_into_scene_collection_l.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_sync_a.py (renamed from tests/python/render_layer/test_move_into_scene_collection_sync_a.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_sync_b.py (renamed from tests/python/render_layer/test_move_into_scene_collection_sync_b.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_sync_c.py (renamed from tests/python/render_layer/test_move_into_scene_collection_sync_c.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_sync_d.py (renamed from tests/python/render_layer/test_move_into_scene_collection_sync_d.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_sync_e.py (renamed from tests/python/render_layer/test_move_into_scene_collection_sync_e.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_sync_f.py (renamed from tests/python/render_layer/test_move_into_scene_collection_sync_f.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_sync_g.py (renamed from tests/python/render_layer/test_move_into_scene_collection_sync_g.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_sync_h.py (renamed from tests/python/render_layer/test_move_into_scene_collection_sync_h.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_sync_i.py (renamed from tests/python/render_layer/test_move_into_scene_collection_sync_i.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_sync_j.py (renamed from tests/python/render_layer/test_move_into_scene_collection_sync_j.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_sync_k.py (renamed from tests/python/render_layer/test_move_into_scene_collection_sync_k.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_move_into_scene_collection_sync_l.py (renamed from tests/python/render_layer/test_move_into_scene_collection_sync_l.py) | 2 | ||||
| -rw-r--r-- | tests/python/view_layer/test_object_add_cylinder.py (renamed from tests/python/render_layer/test_object_add_cylinder.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_object_add_empty.py (renamed from tests/python/render_layer/test_object_add_empty.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_object_add_no_collection_cylinder.py (renamed from tests/python/render_layer/test_object_add_no_collection_cylinder.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_object_add_no_collection_empty.py (renamed from tests/python/render_layer/test_object_add_no_collection_empty.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_object_add_no_collection_torus.py (renamed from tests/python/render_layer/test_object_add_no_collection_torus.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_object_add_torus.py (renamed from tests/python/render_layer/test_object_add_torus.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_object_copy.py (renamed from tests/python/render_layer/test_object_copy.py) | 10 | ||||
| -rw-r--r-- | tests/python/view_layer/test_object_delete_a.py (renamed from tests/python/render_layer/test_object_delete_a.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_object_delete_b.py (renamed from tests/python/render_layer/test_object_delete_b.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_object_link_a.py (renamed from tests/python/render_layer/test_object_link_a.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_object_link_b.py (renamed from tests/python/render_layer/test_object_link_b.py) | 8 | ||||
| -rw-r--r-- | tests/python/view_layer/test_object_link_c.py (renamed from tests/python/render_layer/test_object_link_c.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_operator_context.py (renamed from tests/python/render_layer/test_operator_context.py) | 42 | ||||
| -rw-r--r-- | tests/python/view_layer/test_scene_copy_a.py (renamed from tests/python/render_layer/test_scene_copy_a.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_scene_copy_b.py (renamed from tests/python/render_layer/test_scene_copy_b.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_scene_copy_c.py (renamed from tests/python/render_layer/test_scene_copy_c.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_scene_copy_d.py (renamed from tests/python/render_layer/test_scene_copy_d.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_scene_copy_e.py (renamed from tests/python/render_layer/test_scene_copy_e.py) | 8 | ||||
| -rw-r--r-- | tests/python/view_layer/test_scene_copy_f.py (renamed from tests/python/render_layer/test_scene_copy_f.py) | 12 | ||||
| -rw-r--r-- | tests/python/view_layer/test_scene_delete.py (renamed from tests/python/render_layer/test_scene_delete.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/test_scene_write_read.py (renamed from tests/python/render_layer/test_scene_write_read.py) | 4 | ||||
| -rw-r--r-- | tests/python/view_layer/view_layer_common.py (renamed from tests/python/render_layer/render_layer_common.py) | 48 |
117 files changed, 428 insertions, 428 deletions
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index a3460823e69..dd4c57b43eb 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -592,4 +592,4 @@ if(WITH_ALEMBIC) ) endif() -add_subdirectory(render_layer) +add_subdirectory(view_layer) diff --git a/tests/python/render_layer/CMakeLists.txt b/tests/python/render_layer/CMakeLists.txt deleted file mode 100644 index 5ff985073e3..00000000000 --- a/tests/python/render_layer/CMakeLists.txt +++ /dev/null @@ -1,175 +0,0 @@ -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Contributor(s): Jacques Beaurain, Dalai Felinto. -# -# ***** END GPL LICENSE BLOCK ***** - -# --env-system-scripts allows to run without the install target. - -# Use '--write-blend=/tmp/test.blend' to view output - -set(TEST_SRC_DIR ${CMAKE_SOURCE_DIR}/../lib/tests) -set(TEST_OUT_DIR ${CMAKE_BINARY_DIR}/tests) - -# ugh, any better way to do this on testing only? -execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_OUT_DIR}) - -#~ if(NOT IS_DIRECTORY ${TEST_SRC_DIR}) -#~ message(FATAL_ERROR "CMake test directory not found!") -#~ endif() - -# all calls to blender use this -if(APPLE) - if(${CMAKE_GENERATOR} MATCHES "Xcode") - set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/Debug/blender.app/Contents/MacOS/blender) - else() - set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/blender.app/Contents/MacOS/blender) - endif() -else() - set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/blender) -endif() - -# for testing with valgrind prefix: valgrind --track-origins=yes --error-limit=no -set(TEST_BLENDER_EXE ${TEST_BLENDER_EXE} --background -noaudio --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts) - - -# ------------------------------------------------------------------------------ - -macro(RENDER_LAYER_TEST test_name) - # Adds ${CMAKE_CURRENT_LIST_DIR} to sys.path so that the tests can import - # things from render_layer_common.py - add_test(render_layer_${test_name} ${TEST_BLENDER_EXE} - --python-expr "import sys; sys.path.append('${CMAKE_CURRENT_LIST_DIR}')" - --python-exit-code 1 - --python ${CMAKE_CURRENT_LIST_DIR}/test_${test_name}.py -- - --testdir="${TEST_SRC_DIR}/layers" - ) -endmacro() - -RENDER_LAYER_TEST(active_collection) -RENDER_LAYER_TEST(collection_rename) -RENDER_LAYER_TEST(evaluation_render_settings_a) -RENDER_LAYER_TEST(evaluation_render_settings_b) -RENDER_LAYER_TEST(evaluation_render_settings_c) -RENDER_LAYER_TEST(evaluation_render_settings_d) -RENDER_LAYER_TEST(evaluation_render_settings_e) -RENDER_LAYER_TEST(evaluation_render_settings_f) -RENDER_LAYER_TEST(evaluation_render_settings_g) -RENDER_LAYER_TEST(evaluation_render_settings_h) -RENDER_LAYER_TEST(evaluation_render_settings_i) -RENDER_LAYER_TEST(evaluation_visibility_a) -RENDER_LAYER_TEST(evaluation_visibility_b) -RENDER_LAYER_TEST(evaluation_visibility_c) -RENDER_LAYER_TEST(evaluation_visibility_d) -RENDER_LAYER_TEST(evaluation_visibility_e) -RENDER_LAYER_TEST(evaluation_visibility_f) -RENDER_LAYER_TEST(evaluation_visibility_g) -RENDER_LAYER_TEST(evaluation_visibility_h) -RENDER_LAYER_TEST(evaluation_visibility_i) -RENDER_LAYER_TEST(evaluation_selectability_a) -RENDER_LAYER_TEST(evaluation_selectability_b) -RENDER_LAYER_TEST(evaluation_selectability_c) -RENDER_LAYER_TEST(evaluation_selectability_d) -RENDER_LAYER_TEST(evaluation_selectability_e) -RENDER_LAYER_TEST(evaluation_selectability_f) -RENDER_LAYER_TEST(object_add_cylinder) -RENDER_LAYER_TEST(object_add_empty) -RENDER_LAYER_TEST(object_add_torus) -RENDER_LAYER_TEST(object_add_no_collection_cylinder) -RENDER_LAYER_TEST(object_add_no_collection_empty) -RENDER_LAYER_TEST(object_add_no_collection_torus) -RENDER_LAYER_TEST(object_copy) -RENDER_LAYER_TEST(object_delete_a) -RENDER_LAYER_TEST(object_delete_b) -RENDER_LAYER_TEST(object_link_a) -RENDER_LAYER_TEST(object_link_b) -RENDER_LAYER_TEST(object_link_c) -RENDER_LAYER_TEST(operator_context) -RENDER_LAYER_TEST(move_above_below_scene_collection_a) -RENDER_LAYER_TEST(move_above_below_scene_collection_b) -RENDER_LAYER_TEST(move_above_below_scene_collection_c) -RENDER_LAYER_TEST(move_above_below_scene_collection_d) -RENDER_LAYER_TEST(move_above_below_scene_collection_e) -RENDER_LAYER_TEST(move_above_below_scene_collection_f) -RENDER_LAYER_TEST(move_above_below_scene_collection_g) -RENDER_LAYER_TEST(move_above_below_scene_collection_h) -RENDER_LAYER_TEST(move_above_below_scene_collection_i) -RENDER_LAYER_TEST(move_above_below_scene_collection_sync_a) -RENDER_LAYER_TEST(move_above_below_scene_collection_sync_b) -RENDER_LAYER_TEST(move_above_below_scene_collection_sync_c) -RENDER_LAYER_TEST(move_above_below_scene_collection_sync_d) -RENDER_LAYER_TEST(move_above_below_scene_collection_sync_e) -RENDER_LAYER_TEST(move_above_below_scene_collection_sync_f) -RENDER_LAYER_TEST(move_above_below_scene_collection_sync_g) -RENDER_LAYER_TEST(move_above_below_scene_collection_sync_h) -RENDER_LAYER_TEST(move_above_below_scene_collection_sync_i) -RENDER_LAYER_TEST(move_into_scene_collection_a) -RENDER_LAYER_TEST(move_into_scene_collection_b) -RENDER_LAYER_TEST(move_into_scene_collection_c) -RENDER_LAYER_TEST(move_into_scene_collection_d) -RENDER_LAYER_TEST(move_into_scene_collection_e) -RENDER_LAYER_TEST(move_into_scene_collection_f) -RENDER_LAYER_TEST(move_into_scene_collection_g) -RENDER_LAYER_TEST(move_into_scene_collection_h) -RENDER_LAYER_TEST(move_into_scene_collection_i) -RENDER_LAYER_TEST(move_into_scene_collection_j) -RENDER_LAYER_TEST(move_into_scene_collection_k) -RENDER_LAYER_TEST(move_into_scene_collection_l) -RENDER_LAYER_TEST(move_into_scene_collection_sync_a) -RENDER_LAYER_TEST(move_into_scene_collection_sync_b) -RENDER_LAYER_TEST(move_into_scene_collection_sync_c) -RENDER_LAYER_TEST(move_into_scene_collection_sync_d) -RENDER_LAYER_TEST(move_into_scene_collection_sync_e) -RENDER_LAYER_TEST(move_into_scene_collection_sync_f) -RENDER_LAYER_TEST(move_into_scene_collection_sync_g) -RENDER_LAYER_TEST(move_into_scene_collection_sync_h) -RENDER_LAYER_TEST(move_into_scene_collection_sync_i) -RENDER_LAYER_TEST(move_into_scene_collection_sync_j) -RENDER_LAYER_TEST(move_into_scene_collection_sync_k) -RENDER_LAYER_TEST(move_into_scene_collection_sync_l) -RENDER_LAYER_TEST(move_above_below_layer_collection_a) -RENDER_LAYER_TEST(move_above_below_layer_collection_b) -RENDER_LAYER_TEST(move_above_below_layer_collection_c) -RENDER_LAYER_TEST(move_above_below_layer_collection_d) -RENDER_LAYER_TEST(move_above_below_layer_collection_e) -RENDER_LAYER_TEST(move_above_below_layer_collection_f) -RENDER_LAYER_TEST(move_above_below_layer_collection_g) -RENDER_LAYER_TEST(move_above_below_layer_collection_h) -RENDER_LAYER_TEST(move_above_below_layer_collection_i) -RENDER_LAYER_TEST(move_above_below_layer_collection_j) -RENDER_LAYER_TEST(move_above_below_layer_collection_k) -RENDER_LAYER_TEST(move_above_below_layer_collection_l) -RENDER_LAYER_TEST(move_into_layer_collection_a) -RENDER_LAYER_TEST(move_into_layer_collection_b) -RENDER_LAYER_TEST(move_into_layer_collection_c) -RENDER_LAYER_TEST(move_into_layer_collection_d) -RENDER_LAYER_TEST(move_into_layer_collection_e) -RENDER_LAYER_TEST(move_into_layer_collection_f) -RENDER_LAYER_TEST(move_into_layer_collection_g) -RENDER_LAYER_TEST(move_into_layer_collection_h) -RENDER_LAYER_TEST(move_into_layer_collection_i) -RENDER_LAYER_TEST(move_into_layer_collection_j) -RENDER_LAYER_TEST(layer_linking) -RENDER_LAYER_TEST(layer_syncing) -RENDER_LAYER_TEST(scene_copy_a) -RENDER_LAYER_TEST(scene_copy_b) -RENDER_LAYER_TEST(scene_copy_c) -RENDER_LAYER_TEST(scene_copy_d) -RENDER_LAYER_TEST(scene_copy_e) -RENDER_LAYER_TEST(scene_copy_f) -RENDER_LAYER_TEST(scene_delete) -RENDER_LAYER_TEST(scene_write_read) diff --git a/tests/python/view_layer/CMakeLists.txt b/tests/python/view_layer/CMakeLists.txt new file mode 100644 index 00000000000..48206f61db4 --- /dev/null +++ b/tests/python/view_layer/CMakeLists.txt @@ -0,0 +1,175 @@ +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Contributor(s): Jacques Beaurain, Dalai Felinto. +# +# ***** END GPL LICENSE BLOCK ***** + +# --env-system-scripts allows to run without the install target. + +# Use '--write-blend=/tmp/test.blend' to view output + +set(TEST_SRC_DIR ${CMAKE_SOURCE_DIR}/../lib/tests) +set(TEST_OUT_DIR ${CMAKE_BINARY_DIR}/tests) + +# ugh, any better way to do this on testing only? +execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_OUT_DIR}) + +#~ if(NOT IS_DIRECTORY ${TEST_SRC_DIR}) +#~ message(FATAL_ERROR "CMake test directory not found!") +#~ endif() + +# all calls to blender use this +if(APPLE) + if(${CMAKE_GENERATOR} MATCHES "Xcode") + set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/Debug/blender.app/Contents/MacOS/blender) + else() + set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/blender.app/Contents/MacOS/blender) + endif() +else() + set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/blender) +endif() + +# for testing with valgrind prefix: valgrind --track-origins=yes --error-limit=no +set(TEST_BLENDER_EXE ${TEST_BLENDER_EXE} --background -noaudio --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts) + + +# ------------------------------------------------------------------------------ + +macro(VIEW_LAYER_TEST test_name) + # Adds ${CMAKE_CURRENT_LIST_DIR} to sys.path so that the tests can import + # things from view_layer_common.py + add_test(view_layer_${test_name} ${TEST_BLENDER_EXE} + --python-expr "import sys; sys.path.append('${CMAKE_CURRENT_LIST_DIR}')" + --python-exit-code 1 + --python ${CMAKE_CURRENT_LIST_DIR}/test_${test_name}.py -- + --testdir="${TEST_SRC_DIR}/layers" + ) +endmacro() + +VIEW_LAYER_TEST(active_collection) +VIEW_LAYER_TEST(collection_rename) +VIEW_LAYER_TEST(evaluation_render_settings_a) +VIEW_LAYER_TEST(evaluation_render_settings_b) +VIEW_LAYER_TEST(evaluation_render_settings_c) +VIEW_LAYER_TEST(evaluation_render_settings_d) +VIEW_LAYER_TEST(evaluation_render_settings_e) +VIEW_LAYER_TEST(evaluation_render_settings_f) +VIEW_LAYER_TEST(evaluation_render_settings_g) +VIEW_LAYER_TEST(evaluation_render_settings_h) +VIEW_LAYER_TEST(evaluation_render_settings_i) +VIEW_LAYER_TEST(evaluation_visibility_a) +VIEW_LAYER_TEST(evaluation_visibility_b) +VIEW_LAYER_TEST(evaluation_visibility_c) +VIEW_LAYER_TEST(evaluation_visibility_d) +VIEW_LAYER_TEST(evaluation_visibility_e) +VIEW_LAYER_TEST(evaluation_visibility_f) +VIEW_LAYER_TEST(evaluation_visibility_g) +VIEW_LAYER_TEST(evaluation_visibility_h) +VIEW_LAYER_TEST(evaluation_visibility_i) +VIEW_LAYER_TEST(evaluation_selectability_a) +VIEW_LAYER_TEST(evaluation_selectability_b) +VIEW_LAYER_TEST(evaluation_selectability_c) +VIEW_LAYER_TEST(evaluation_selectability_d) +VIEW_LAYER_TEST(evaluation_selectability_e) +VIEW_LAYER_TEST(evaluation_selectability_f) +VIEW_LAYER_TEST(object_add_cylinder) +VIEW_LAYER_TEST(object_add_empty) +VIEW_LAYER_TEST(object_add_torus) +VIEW_LAYER_TEST(object_add_no_collection_cylinder) +VIEW_LAYER_TEST(object_add_no_collection_empty) +VIEW_LAYER_TEST(object_add_no_collection_torus) +VIEW_LAYER_TEST(object_copy) +VIEW_LAYER_TEST(object_delete_a) +VIEW_LAYER_TEST(object_delete_b) +VIEW_LAYER_TEST(object_link_a) +VIEW_LAYER_TEST(object_link_b) +VIEW_LAYER_TEST(object_link_c) +VIEW_LAYER_TEST(operator_context) +VIEW_LAYER_TEST(move_above_below_scene_collection_a) +VIEW_LAYER_TEST(move_above_below_scene_collection_b) +VIEW_LAYER_TEST(move_above_below_scene_collection_c) +VIEW_LAYER_TEST(move_above_below_scene_collection_d) +VIEW_LAYER_TEST(move_above_below_scene_collection_e) +VIEW_LAYER_TEST(move_above_below_scene_collection_f) +VIEW_LAYER_TEST(move_above_below_scene_collection_g) +VIEW_LAYER_TEST(move_above_below_scene_collection_h) +VIEW_LAYER_TEST(move_above_below_scene_collection_i) +VIEW_LAYER_TEST(move_above_below_scene_collection_sync_a) +VIEW_LAYER_TEST(move_above_below_scene_collection_sync_b) +VIEW_LAYER_TEST(move_above_below_scene_collection_sync_c) +VIEW_LAYER_TEST(move_above_below_scene_collection_sync_d) +VIEW_LAYER_TEST(move_above_below_scene_collection_sync_e) +VIEW_LAYER_TEST(move_above_below_scene_collection_sync_f) +VIEW_LAYER_TEST(move_above_below_scene_collection_sync_g) +VIEW_LAYER_TEST(move_above_below_scene_collection_sync_h) +VIEW_LAYER_TEST(move_above_below_scene_collection_sync_i) +VIEW_LAYER_TEST(move_into_scene_collection_a) +VIEW_LAYER_TEST(move_into_scene_collection_b) +VIEW_LAYER_TEST(move_into_scene_collection_c) +VIEW_LAYER_TEST(move_into_scene_collection_d) +VIEW_LAYER_TEST(move_into_scene_collection_e) +VIEW_LAYER_TEST(move_into_scene_collection_f) +VIEW_LAYER_TEST(move_into_scene_collection_g) +VIEW_LAYER_TEST(move_into_scene_collection_h) +VIEW_LAYER_TEST(move_into_scene_collection_i) +VIEW_LAYER_TEST(move_into_scene_collection_j) +VIEW_LAYER_TEST(move_into_scene_collection_k) +VIEW_LAYER_TEST(move_into_scene_collection_l) +VIEW_LAYER_TEST(move_into_scene_collection_sync_a) +VIEW_LAYER_TEST(move_into_scene_collection_sync_b) +VIEW_LAYER_TEST(move_into_scene_collection_sync_c) +VIEW_LAYER_TEST(move_into_scene_collection_sync_d) +VIEW_LAYER_TEST(move_into_scene_collection_sync_e) +VIEW_LAYER_TEST(move_into_scene_collection_sync_f) +VIEW_LAYER_TEST(move_into_scene_collection_sync_g) +VIEW_LAYER_TEST(move_into_scene_collection_sync_h) +VIEW_LAYER_TEST(move_into_scene_collection_sync_i) +VIEW_LAYER_TEST(move_into_scene_collection_sync_j) +VIEW_LAYER_TEST(move_into_scene_collection_sync_k) +VIEW_LAYER_TEST(move_into_scene_collection_sync_l) +VIEW_LAYER_TEST(move_above_below_layer_collection_a) +VIEW_LAYER_TEST(move_above_below_layer_collection_b) +VIEW_LAYER_TEST(move_above_below_layer_collection_c) +VIEW_LAYER_TEST(move_above_below_layer_collection_d) +VIEW_LAYER_TEST(move_above_below_layer_collection_e) +VIEW_LAYER_TEST(move_above_below_layer_collection_f) +VIEW_LAYER_TEST(move_above_below_layer_collection_g) +VIEW_LAYER_TEST(move_above_below_layer_collection_h) +VIEW_LAYER_TEST(move_above_below_layer_collection_i) +VIEW_LAYER_TEST(move_above_below_layer_collection_j) +VIEW_LAYER_TEST(move_above_below_layer_collection_k) +VIEW_LAYER_TEST(move_above_below_layer_collection_l) +VIEW_LAYER_TEST(move_into_layer_collection_a) +VIEW_LAYER_TEST(move_into_layer_collection_b) +VIEW_LAYER_TEST(move_into_layer_collection_c) +VIEW_LAYER_TEST(move_into_layer_collection_d) +VIEW_LAYER_TEST(move_into_layer_collection_e) +VIEW_LAYER_TEST(move_into_layer_collection_f) +VIEW_LAYER_TEST(move_into_layer_collection_g) +VIEW_LAYER_TEST(move_into_layer_collection_h) +VIEW_LAYER_TEST(move_into_layer_collection_i) +VIEW_LAYER_TEST(move_into_layer_collection_j) +VIEW_LAYER_TEST(layer_linking) +VIEW_LAYER_TEST(layer_syncing) +VIEW_LAYER_TEST(scene_copy_a) +VIEW_LAYER_TEST(scene_copy_b) +VIEW_LAYER_TEST(scene_copy_c) +VIEW_LAYER_TEST(scene_copy_d) +VIEW_LAYER_TEST(scene_copy_e) +VIEW_LAYER_TEST(scene_copy_f) +VIEW_LAYER_TEST(scene_delete) +VIEW_LAYER_TEST(scene_write_read) diff --git a/tests/python/render_layer/test_active_collection.py b/tests/python/view_layer/test_active_collection.py index 0094400f2a5..10df71f77ce 100644 --- a/tests/python/render_layer/test_active_collection.py +++ b/tests/python/view_layer/test_active_collection.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_active_collection(self): """ See if active collection index is working @@ -38,7 +38,7 @@ class UnitTesting(RenderLayerTesting): scorpion = subzero.collections.new('scorpion') subzero.objects.link(three_b) scorpion.objects.link(three_c) - layer = scene.render_layers.new('Fresh new Layer') + layer = scene.view_layers.new('Fresh new Layer') layer.collections.link(subzero) lookup = [ diff --git a/tests/python/render_layer/test_collection_rename.py b/tests/python/view_layer/test_collection_rename.py index 5cab6c10102..3fcc5981e68 100644 --- a/tests/python/render_layer/test_collection_rename.py +++ b/tests/python/view_layer/test_collection_rename.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def setup_family(self): import bpy scene = bpy.context.scene diff --git a/tests/python/render_layer/test_evaluation_render_settings_a.py b/tests/python/view_layer/test_evaluation_render_settings_a.py index 3a763dff5b1..e1e78ecdc13 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_a.py +++ b/tests/python/view_layer/test_evaluation_render_settings_a.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_render_settings(self): """ See if the depsgraph evaluation is correct diff --git a/tests/python/render_layer/test_evaluation_render_settings_b.py b/tests/python/view_layer/test_evaluation_render_settings_b.py index 01536e7edb1..5cc055095a1 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_b.py +++ b/tests/python/view_layer/test_evaluation_render_settings_b.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_render_settings(self): """ See if the depsgraph evaluation is correct diff --git a/tests/python/render_layer/test_evaluation_render_settings_c.py b/tests/python/view_layer/test_evaluation_render_settings_c.py index 62450fac771..805f6949ba2 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_c.py +++ b/tests/python/view_layer/test_evaluation_render_settings_c.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_render_settings(self): """ See if the depsgraph evaluation is correct diff --git a/tests/python/render_layer/test_evaluation_render_settings_d.py b/tests/python/view_layer/test_evaluation_render_settings_d.py index cf29c4928a7..9fa90b66931 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_d.py +++ b/tests/python/view_layer/test_evaluation_render_settings_d.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_render_settings(self): """ See if the depsgraph evaluation is correct diff --git a/tests/python/render_layer/test_evaluation_render_settings_e.py b/tests/python/view_layer/test_evaluation_render_settings_e.py index 664fae7a208..e5cb8b2b295 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_e.py +++ b/tests/python/view_layer/test_evaluation_render_settings_e.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_render_settings(self): """ See if the depsgraph evaluation is correct diff --git a/tests/python/render_layer/test_evaluation_render_settings_f.py b/tests/python/view_layer/test_evaluation_render_settings_f.py index 47da4e65fcf..e7e834ff7fa 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_f.py +++ b/tests/python/view_layer/test_evaluation_render_settings_f.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_render_settings(self): """ See if the depsgraph evaluation is correct diff --git a/tests/python/render_layer/test_evaluation_render_settings_g.py b/tests/python/view_layer/test_evaluation_render_settings_g.py index 81f31fed410..32f3529eef8 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_g.py +++ b/tests/python/view_layer/test_evaluation_render_settings_g.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_render_settings(self): """ See if the depsgraph evaluation is correct diff --git a/tests/python/render_layer/test_evaluation_render_settings_h.py b/tests/python/view_layer/test_evaluation_render_settings_h.py index b6f61ddb031..3e175068006 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_h.py +++ b/tests/python/view_layer/test_evaluation_render_settings_h.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_render_settings(self): """ See if the depsgraph evaluation is correct diff --git a/tests/python/render_layer/test_evaluation_render_settings_i.py b/tests/python/view_layer/test_evaluation_render_settings_i.py index 1ce307deb70..e84c360f859 100644 --- a/tests/python/render_layer/test_evaluation_render_settings_i.py +++ b/tests/python/view_layer/test_evaluation_render_settings_i.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_render_settings(self): """ See if the depsgraph evaluation is correct diff --git a/tests/python/render_layer/test_evaluation_selectability_a.py b/tests/python/view_layer/test_evaluation_selectability_a.py index 393f406eefc..4dba8ab224d 100644 --- a/tests/python/render_layer/test_evaluation_selectability_a.py +++ b/tests/python/view_layer/test_evaluation_selectability_a.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_selectability(self): """ See if the depsgraph evaluation is correct @@ -24,10 +24,10 @@ class UnitTesting(RenderLayerTesting): workspace = bpy.context.workspace cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh')) - layer = scene.render_layers.new('Selectability Test') + layer = scene.view_layers.new('Selectability Test') layer.collections.unlink(layer.collections[0]) - scene.render_layers.active = layer - workspace.render_layer = layer + scene.view_layers.active = layer + workspace.view_layer = layer scene_collection_mom = scene.master_collection.collections.new("Mom") scene_collection_kid = scene_collection_mom.collections.new("Kid") diff --git a/tests/python/render_layer/test_evaluation_selectability_b.py b/tests/python/view_layer/test_evaluation_selectability_b.py index ea05710ebcf..9cb2cd76f17 100644 --- a/tests/python/render_layer/test_evaluation_selectability_b.py +++ b/tests/python/view_layer/test_evaluation_selectability_b.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_selectability(self): """ See if the depsgraph evaluation is correct @@ -24,10 +24,10 @@ class UnitTesting(RenderLayerTesting): workspace = bpy.context.workspace cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh')) - layer = scene.render_layers.new('Selectability Test') + layer = scene.view_layers.new('Selectability Test') layer.collections.unlink(layer.collections[0]) - scene.render_layers.active = layer - workspace.render_layer = layer + scene.view_layers.active = layer + workspace.view_layer = layer scene_collection_mom = scene.master_collection.collections.new("Mom") scene_collection_kid = scene_collection_mom.collections.new("Kid") diff --git a/tests/python/render_layer/test_evaluation_selectability_c.py b/tests/python/view_layer/test_evaluation_selectability_c.py index 8487ee1a8af..9536aaf4edc 100644 --- a/tests/python/render_layer/test_evaluation_selectability_c.py +++ b/tests/python/view_layer/test_evaluation_selectability_c.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_selectability(self): """ See if the depsgraph evaluation is correct @@ -24,10 +24,10 @@ class UnitTesting(RenderLayerTesting): workspace = bpy.context.workspace cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh')) - layer = scene.render_layers.new('Selectability Test') + layer = scene.view_layers.new('Selectability Test') layer.collections.unlink(layer.collections[0]) - scene.render_layers.active = layer - workspace.render_layer = layer + scene.view_layers.active = layer + workspace.view_layer = layer scene_collection_mom = scene.master_collection.collections.new("Mom") scene_collection_kid = scene_collection_mom.collections.new("Kid") diff --git a/tests/python/render_layer/test_evaluation_selectability_d.py b/tests/python/view_layer/test_evaluation_selectability_d.py index b2a924dd6bc..ddfec6132e6 100644 --- a/tests/python/render_layer/test_evaluation_selectability_d.py +++ b/tests/python/view_layer/test_evaluation_selectability_d.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_selectability(self): """ See if the depsgraph evaluation is correct @@ -24,10 +24,10 @@ class UnitTesting(RenderLayerTesting): workspace = bpy.context.workspace cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh')) - layer = scene.render_layers.new('Selectability Test') + layer = scene.view_layers.new('Selectability Test') layer.collections.unlink(layer.collections[0]) - scene.render_layers.active = layer - workspace.render_layer = layer + scene.view_layers.active = layer + workspace.view_layer = layer scene_collection_mom = scene.master_collection.collections.new("Mom") scene_collection_kid = scene_collection_mom.collections.new("Kid") diff --git a/tests/python/render_layer/test_evaluation_selectability_e.py b/tests/python/view_layer/test_evaluation_selectability_e.py index 70ede58cb9e..02017321734 100644 --- a/tests/python/render_layer/test_evaluation_selectability_e.py +++ b/tests/python/view_layer/test_evaluation_selectability_e.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_selectability(self): """ See if the depsgraph evaluation is correct @@ -24,10 +24,10 @@ class UnitTesting(RenderLayerTesting): workspace = bpy.context.workspace cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh')) - layer = scene.render_layers.new('Selectability Test') + layer = scene.view_layers.new('Selectability Test') layer.collections.unlink(layer.collections[0]) - scene.render_layers.active = layer - workspace.render_layer = layer + scene.view_layers.active = layer + workspace.view_layer = layer scene_collection_mom = scene.master_collection.collections.new("Mom") scene_collection_kid = scene_collection_mom.collections.new("Kid") diff --git a/tests/python/render_layer/test_evaluation_selectability_f.py b/tests/python/view_layer/test_evaluation_selectability_f.py index 7fddfa54b04..1cffed9b0f4 100644 --- a/tests/python/render_layer/test_evaluation_selectability_f.py +++ b/tests/python/view_layer/test_evaluation_selectability_f.py @@ -6,21 +6,21 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_selectability(self): import bpy scene = bpy.context.scene cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh')) scene_collection = scene.master_collection.collections.new('collection') - layer_collection = scene.render_layers.active.collections.link(scene_collection) + layer_collection = scene.view_layers.active.collections.link(scene_collection) bpy.context.scene.update() # update depsgraph diff --git a/tests/python/render_layer/test_evaluation_visibility_a.py b/tests/python/view_layer/test_evaluation_visibility_a.py index b9f57539330..ad9b92dd937 100644 --- a/tests/python/render_layer/test_evaluation_visibility_a.py +++ b/tests/python/view_layer/test_evaluation_visibility_a.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_visibility(self): """ See if the depsgraph evaluation is correct @@ -24,10 +24,10 @@ class UnitTesting(RenderLayerTesting): workspace = bpy.context.workspace cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh')) - layer = scene.render_layers.new('Visibility Test') + layer = scene.view_layers.new('Visibility Test') layer.collections.unlink(layer.collections[0]) - scene.render_layers.active = layer - workspace.render_layer = layer + scene.view_layers.active = layer + workspace.view_layer = layer scene_collection_mom = scene.master_collection.collections.new("Mom") scene_collection_kid = scene.master_collection.collections.new("Kid") diff --git a/tests/python/render_layer/test_evaluation_visibility_b.py b/tests/python/view_layer/test_evaluation_visibility_b.py index 712cc9bd277..1a3c6605027 100644 --- a/tests/python/render_layer/test_evaluation_visibility_b.py +++ b/tests/python/view_layer/test_evaluation_visibility_b.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_visibility(self): """ See if the depsgraph evaluation is correct @@ -24,10 +24,10 @@ class UnitTesting(RenderLayerTesting): workspace = bpy.context.workspace cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh')) - layer = scene.render_layers.new('Visibility Test') + layer = scene.view_layers.new('Visibility Test') layer.collections.unlink(layer.collections[0]) - scene.render_layers.active = layer - workspace.render_layer = layer + scene.view_layers.active = layer + workspace.view_layer = layer scene_collection_mom = scene.master_collection.collections.new("Mom") scene_collection_kid = scene_collection_mom.collections.new("Kid") diff --git a/tests/python/render_layer/test_evaluation_visibility_c.py b/tests/python/view_layer/test_evaluation_visibility_c.py index 5e378fb07e3..7285c1cdea5 100644 --- a/tests/python/render_layer/test_evaluation_visibility_c.py +++ b/tests/python/view_layer/test_evaluation_visibility_c.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_visibility(self): """ See if the depsgraph evaluation is correct @@ -24,10 +24,10 @@ class UnitTesting(RenderLayerTesting): workspace = bpy.context.workspace cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh')) - layer = scene.render_layers.new('Visibility Test') + layer = scene.view_layers.new('Visibility Test') layer.collections.unlink(layer.collections[0]) - scene.render_layers.active = layer - workspace.render_layer = layer + scene.view_layers.active = layer + workspace.view_layer = layer scene_collection_mom = scene.master_collection.collections.new("Mom") scene_collection_kid = scene_collection_mom.collections.new("Kid") diff --git a/tests/python/render_layer/test_evaluation_visibility_d.py b/tests/python/view_layer/test_evaluation_visibility_d.py index e4f0957bd26..ed5d452e4ca 100644 --- a/tests/python/render_layer/test_evaluation_visibility_d.py +++ b/tests/python/view_layer/test_evaluation_visibility_d.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_visibility(self): """ See if the depsgraph evaluation is correct @@ -24,10 +24,10 @@ class UnitTesting(RenderLayerTesting): workspace = bpy.context.workspace cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh')) - layer = scene.render_layers.new('Visibility Test') + layer = scene.view_layers.new('Visibility Test') layer.collections.unlink(layer.collections[0]) - scene.render_layers.active = layer - workspace.render_layer = layer + scene.view_layers.active = layer + workspace.view_layer = layer scene_collection_mom = scene.master_collection.collections.new("Mom") scene_collection_kid = scene_collection_mom.collections.new("Kid") diff --git a/tests/python/render_layer/test_evaluation_visibility_e.py b/tests/python/view_layer/test_evaluation_visibility_e.py index 33c6d7be111..006836f27b9 100644 --- a/tests/python/render_layer/test_evaluation_visibility_e.py +++ b/tests/python/view_layer/test_evaluation_visibility_e.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_visibility(self): """ See if the depsgraph evaluation is correct @@ -24,10 +24,10 @@ class UnitTesting(RenderLayerTesting): workspace = bpy.context.workspace cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh')) - layer = scene.render_layers.new('Visibility Test') + layer = scene.view_layers.new('Visibility Test') layer.collections.unlink(layer.collections[0]) - scene.render_layers.active = layer - workspace.render_layer = layer + scene.view_layers.active = layer + workspace.view_layer = layer scene_collection_mom = scene.master_collection.collections.new("Mom") scene_collection_kid = scene_collection_mom.collections.new("Kid") diff --git a/tests/python/render_layer/test_evaluation_visibility_f.py b/tests/python/view_layer/test_evaluation_visibility_f.py index 66948b343cb..bc0050d8efa 100644 --- a/tests/python/render_layer/test_evaluation_visibility_f.py +++ b/tests/python/view_layer/test_evaluation_visibility_f.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_visibility(self): """ See if the depsgraph evaluation is correct @@ -24,10 +24,10 @@ class UnitTesting(RenderLayerTesting): workspace = bpy.context.workspace cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh')) - layer = scene.render_layers.new('Visibility Test') + layer = scene.view_layers.new('Visibility Test') layer.collections.unlink(layer.collections[0]) - scene.render_layers.active = layer - workspace.render_layer = layer + scene.view_layers.active = layer + workspace.view_layer = layer scene_collection_mom = scene.master_collection.collections.new("Mom") scene_collection_kid = scene_collection_mom.collections.new("Kid") diff --git a/tests/python/render_layer/test_evaluation_visibility_g.py b/tests/python/view_layer/test_evaluation_visibility_g.py index eb8d3fa8177..d2dc7f27e87 100644 --- a/tests/python/render_layer/test_evaluation_visibility_g.py +++ b/tests/python/view_layer/test_evaluation_visibility_g.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_visibility_empty(self): """ See if the depsgraph evaluation is correct diff --git a/tests/python/render_layer/test_evaluation_visibility_h.py b/tests/python/view_layer/test_evaluation_visibility_h.py index 9b47d0602b6..0b1d779c152 100644 --- a/tests/python/render_layer/test_evaluation_visibility_h.py +++ b/tests/python/view_layer/test_evaluation_visibility_h.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_visibility_cylinder(self): """ See if the depsgraph evaluation is correct diff --git a/tests/python/render_layer/test_evaluation_visibility_i.py b/tests/python/view_layer/test_evaluation_visibility_i.py index 47cde444a66..5a292eadd91 100644 --- a/tests/python/render_layer/test_evaluation_visibility_i.py +++ b/tests/python/view_layer/test_evaluation_visibility_i.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_visibility_torus(self): """ See if the depsgraph evaluation is correct diff --git a/tests/python/render_layer/test_layer_linking.py b/tests/python/view_layer/test_layer_linking.py index b0cd576d915..4c66c564d7c 100644 --- a/tests/python/render_layer/test_layer_linking.py +++ b/tests/python/view_layer/test_layer_linking.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def do_layer_linking(self, filepath_json, link_mode): import bpy import os @@ -42,7 +42,7 @@ class UnitTesting(RenderLayerTesting): scorpion.objects.link(three_c) # test unlinking sync - layer = scene.render_layers.new('Fresh new Layer') + layer = scene.view_layers.new('Fresh new Layer') if link_mode in {'COLLECTION_LINK', 'COLLECTION_UNLINK'}: layer.collections.link(subzero) diff --git a/tests/python/render_layer/test_layer_syncing.py b/tests/python/view_layer/test_layer_syncing.py index 9ebfe437698..d8175c4850f 100644 --- a/tests/python/render_layer/test_layer_syncing.py +++ b/tests/python/view_layer/test_layer_syncing.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def do_syncing(self, filepath_json, unlink_mode): import bpy import os diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_a.py b/tests/python/view_layer/test_move_above_below_layer_collection_a.py index a36f1f56543..7c6c1fccfa9 100644 --- a/tests/python/render_layer/test_move_above_below_layer_collection_a.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_a.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_b.py b/tests/python/view_layer/test_move_above_below_layer_collection_b.py index 373af511e3f..671978a27f3 100644 --- a/tests/python/render_layer/test_move_above_below_layer_collection_b.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_b.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_c.py b/tests/python/view_layer/test_move_above_below_layer_collection_c.py index 373af511e3f..671978a27f3 100644 --- a/tests/python/render_layer/test_move_above_below_layer_collection_c.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_c.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_d.py b/tests/python/view_layer/test_move_above_below_layer_collection_d.py index 8fb1589f741..b13e87985ee 100644 --- a/tests/python/render_layer/test_move_above_below_layer_collection_d.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_d.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_e.py b/tests/python/view_layer/test_move_above_below_layer_collection_e.py index e9b5ab5dbd9..a9b0181083e 100644 --- a/tests/python/render_layer/test_move_above_below_layer_collection_e.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_e.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_f.py b/tests/python/view_layer/test_move_above_below_layer_collection_f.py index 7b2d00bde2c..8182655ebbd 100644 --- a/tests/python/render_layer/test_move_above_below_layer_collection_f.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_f.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_g.py b/tests/python/view_layer/test_move_above_below_layer_collection_g.py index c1b85fb357d..7ee7aff9dc7 100644 --- a/tests/python/render_layer/test_move_above_below_layer_collection_g.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_g.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_h.py b/tests/python/view_layer/test_move_above_below_layer_collection_h.py index 090a3c4a49e..4581f9d4767 100644 --- a/tests/python/render_layer/test_move_above_below_layer_collection_h.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_h.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_i.py b/tests/python/view_layer/test_move_above_below_layer_collection_i.py index 12aa858ffae..fd204cc0a46 100644 --- a/tests/python/render_layer/test_move_above_below_layer_collection_i.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_i.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_j.py b/tests/python/view_layer/test_move_above_below_layer_collection_j.py index af92abac2d3..7c9dcbfdb3a 100644 --- a/tests/python/render_layer/test_move_above_below_layer_collection_j.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_j.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_k.py b/tests/python/view_layer/test_move_above_below_layer_collection_k.py index 74dc68d986f..f6d442619f5 100644 --- a/tests/python/render_layer/test_move_above_below_layer_collection_k.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_k.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_l.py b/tests/python/view_layer/test_move_above_below_layer_collection_l.py index aebef498f26..2bc1054ec7e 100644 --- a/tests/python/render_layer/test_move_above_below_layer_collection_l.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_l.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_a.py b/tests/python/view_layer/test_move_above_below_scene_collection_a.py index b53370befaf..3e45102e0b2 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_a.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_a.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_b.py b/tests/python/view_layer/test_move_above_below_scene_collection_b.py index 1eb62d5bfbd..83980705846 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_b.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_b.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_c.py b/tests/python/view_layer/test_move_above_below_scene_collection_c.py index c482376a761..cceb2bb235b 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_c.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_c.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_d.py b/tests/python/view_layer/test_move_above_below_scene_collection_d.py index 1fce4cd5b62..5917e9ceb6c 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_d.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_d.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_e.py b/tests/python/view_layer/test_move_above_below_scene_collection_e.py index 797e1fe3fa6..12778ff9131 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_e.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_e.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_f.py b/tests/python/view_layer/test_move_above_below_scene_collection_f.py index 6616e4135e7..b9d5e8eff24 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_f.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_f.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_g.py b/tests/python/view_layer/test_move_above_below_scene_collection_g.py index b4ac53c7bbe..39848103ca2 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_g.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_g.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_h.py b/tests/python/view_layer/test_move_above_below_scene_collection_h.py index a1da80ef2ac..af2f54f3db1 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_h.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_h.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_i.py b/tests/python/view_layer/test_move_above_below_scene_collection_i.py index 80574558cce..a6b3cb568c9 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_i.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_i.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_a.py b/tests/python/view_layer/test_move_above_below_scene_collection_sync_a.py index d562e220c0d..d36930dcbc5 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_a.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_sync_a.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_b.py b/tests/python/view_layer/test_move_above_below_scene_collection_sync_b.py index e9bcbd3f956..79718e1168a 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_b.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_sync_b.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_c.py b/tests/python/view_layer/test_move_above_below_scene_collection_sync_c.py index f740e4ddd25..ef23b722b8b 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_c.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_sync_c.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_d.py b/tests/python/view_layer/test_move_above_below_scene_collection_sync_d.py index b71bce092f9..05c3bcdbcbb 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_d.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_sync_d.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_e.py b/tests/python/view_layer/test_move_above_below_scene_collection_sync_e.py index 2e708503742..ebab970ba19 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_e.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_sync_e.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_f.py b/tests/python/view_layer/test_move_above_below_scene_collection_sync_f.py index 3e84ebc4096..7e4f0bc4a9c 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_f.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_sync_f.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_g.py b/tests/python/view_layer/test_move_above_below_scene_collection_sync_g.py index 62ecbf273c4..8c64dd6f32d 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_g.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_sync_g.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_h.py b/tests/python/view_layer/test_move_above_below_scene_collection_sync_h.py index a2a24f8848e..dd0fcc1f732 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_h.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_sync_h.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_above_below_scene_collection_sync_i.py b/tests/python/view_layer/test_move_above_below_scene_collection_sync_i.py index 8d9ef808f42..cdd43f5b8df 100644 --- a/tests/python/render_layer/test_move_above_below_scene_collection_sync_i.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_sync_i.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_layer_collection_a.py b/tests/python/view_layer/test_move_into_layer_collection_a.py index 46e53ebb2fb..ef5a839a44a 100644 --- a/tests/python/render_layer/test_move_into_layer_collection_a.py +++ b/tests/python/view_layer/test_move_into_layer_collection_a.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_layer_collection_b.py b/tests/python/view_layer/test_move_into_layer_collection_b.py index 20c2e9e453f..77f5d2f2630 100644 --- a/tests/python/render_layer/test_move_into_layer_collection_b.py +++ b/tests/python/view_layer/test_move_into_layer_collection_b.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_layer_collection_c.py b/tests/python/view_layer/test_move_into_layer_collection_c.py index 4a547a2e08c..8ce07dd332e 100644 --- a/tests/python/render_layer/test_move_into_layer_collection_c.py +++ b/tests/python/view_layer/test_move_into_layer_collection_c.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_layer_collection_d.py b/tests/python/view_layer/test_move_into_layer_collection_d.py index 7ca24a3265c..715ea6de1da 100644 --- a/tests/python/render_layer/test_move_into_layer_collection_d.py +++ b/tests/python/view_layer/test_move_into_layer_collection_d.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_layer_collection_e.py b/tests/python/view_layer/test_move_into_layer_collection_e.py index f235d575090..6be1a27481f 100644 --- a/tests/python/render_layer/test_move_into_layer_collection_e.py +++ b/tests/python/view_layer/test_move_into_layer_collection_e.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_layer_collection_f.py b/tests/python/view_layer/test_move_into_layer_collection_f.py index 5a4267f107d..d857fd4cd1b 100644 --- a/tests/python/render_layer/test_move_into_layer_collection_f.py +++ b/tests/python/view_layer/test_move_into_layer_collection_f.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_layer_collection_g.py b/tests/python/view_layer/test_move_into_layer_collection_g.py index 6845d13aa2f..c3a0e80c3a0 100644 --- a/tests/python/render_layer/test_move_into_layer_collection_g.py +++ b/tests/python/view_layer/test_move_into_layer_collection_g.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_layer_collection_h.py b/tests/python/view_layer/test_move_into_layer_collection_h.py index 294a0054083..fc0bef61214 100644 --- a/tests/python/render_layer/test_move_into_layer_collection_h.py +++ b/tests/python/view_layer/test_move_into_layer_collection_h.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_layer_collection_i.py b/tests/python/view_layer/test_move_into_layer_collection_i.py index a29ff607c47..23c6e9f997c 100644 --- a/tests/python/render_layer/test_move_into_layer_collection_i.py +++ b/tests/python/view_layer/test_move_into_layer_collection_i.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_layer_collection_j.py b/tests/python/view_layer/test_move_into_layer_collection_j.py index fd98364db5b..e3d0f6c7cc8 100644 --- a/tests/python/render_layer/test_move_into_layer_collection_j.py +++ b/tests/python/view_layer/test_move_into_layer_collection_j.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_a.py b/tests/python/view_layer/test_move_into_scene_collection_a.py index 00294a9b978..c5671d46316 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_a.py +++ b/tests/python/view_layer/test_move_into_scene_collection_a.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_b.py b/tests/python/view_layer/test_move_into_scene_collection_b.py index 3c92a0b8bd1..08cacde6f0c 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_b.py +++ b/tests/python/view_layer/test_move_into_scene_collection_b.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_c.py b/tests/python/view_layer/test_move_into_scene_collection_c.py index 03ef0df47b0..83b1d2fc52b 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_c.py +++ b/tests/python/view_layer/test_move_into_scene_collection_c.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_d.py b/tests/python/view_layer/test_move_into_scene_collection_d.py index 24678a3b530..c8346c43e05 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_d.py +++ b/tests/python/view_layer/test_move_into_scene_collection_d.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_e.py b/tests/python/view_layer/test_move_into_scene_collection_e.py index 6f8115e42b3..00a4274c564 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_e.py +++ b/tests/python/view_layer/test_move_into_scene_collection_e.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_f.py b/tests/python/view_layer/test_move_into_scene_collection_f.py index dcc62e6b7bb..4cba04c35a5 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_f.py +++ b/tests/python/view_layer/test_move_into_scene_collection_f.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_g.py b/tests/python/view_layer/test_move_into_scene_collection_g.py index 5a96f901523..5ca2658407f 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_g.py +++ b/tests/python/view_layer/test_move_into_scene_collection_g.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_h.py b/tests/python/view_layer/test_move_into_scene_collection_h.py index 24dce2c7cc9..1524dbad7bc 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_h.py +++ b/tests/python/view_layer/test_move_into_scene_collection_h.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_i.py b/tests/python/view_layer/test_move_into_scene_collection_i.py index 445fb78a345..2240ba50d75 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_i.py +++ b/tests/python/view_layer/test_move_into_scene_collection_i.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_j.py b/tests/python/view_layer/test_move_into_scene_collection_j.py index bbf682a7082..1625b6c517e 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_j.py +++ b/tests/python/view_layer/test_move_into_scene_collection_j.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_k.py b/tests/python/view_layer/test_move_into_scene_collection_k.py index afc260d51ae..2d4d5b51e29 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_k.py +++ b/tests/python/view_layer/test_move_into_scene_collection_k.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_l.py b/tests/python/view_layer/test_move_into_scene_collection_l.py index b600db03a0c..f2d52b38fe5 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_l.py +++ b/tests/python/view_layer/test_move_into_scene_collection_l.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_a.py b/tests/python/view_layer/test_move_into_scene_collection_sync_a.py index e49baaeb84a..60001b9b049 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_sync_a.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_a.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_b.py b/tests/python/view_layer/test_move_into_scene_collection_sync_b.py index 78d24dfea98..a4d05b57f77 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_sync_b.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_b.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_c.py b/tests/python/view_layer/test_move_into_scene_collection_sync_c.py index 3b9a2cfdbb6..3f125d513ce 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_sync_c.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_c.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_d.py b/tests/python/view_layer/test_move_into_scene_collection_sync_d.py index cf9d1b851e5..87234efef20 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_sync_d.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_d.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_e.py b/tests/python/view_layer/test_move_into_scene_collection_sync_e.py index 087920f0c89..689b4976dab 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_sync_e.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_e.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_f.py b/tests/python/view_layer/test_move_into_scene_collection_sync_f.py index 554fb941c28..e486f48aac1 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_sync_f.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_f.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_g.py b/tests/python/view_layer/test_move_into_scene_collection_sync_g.py index 09a544b0d27..3792e9429a3 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_sync_g.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_g.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_h.py b/tests/python/view_layer/test_move_into_scene_collection_sync_h.py index a2338e70f08..8b3ceb14d73 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_sync_h.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_h.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_i.py b/tests/python/view_layer/test_move_into_scene_collection_sync_i.py index 59e0a06cd73..8262dcc06c1 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_sync_i.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_i.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_j.py b/tests/python/view_layer/test_move_into_scene_collection_sync_j.py index b1e2d3446a6..519c1b81269 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_sync_j.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_j.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_k.py b/tests/python/view_layer/test_move_into_scene_collection_sync_k.py index f5fbe9898e3..4c785418b0e 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_sync_k.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_k.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_move_into_scene_collection_sync_l.py b/tests/python/view_layer/test_move_into_scene_collection_sync_l.py index d8133938fd7..f50cd6f7072 100644 --- a/tests/python/render_layer/test_move_into_scene_collection_sync_l.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_l.py @@ -6,7 +6,7 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ diff --git a/tests/python/render_layer/test_object_add_cylinder.py b/tests/python/view_layer/test_object_add_cylinder.py index d561f1c04fc..c982219a2c9 100644 --- a/tests/python/render_layer/test_object_add_cylinder.py +++ b/tests/python/view_layer/test_object_add_cylinder.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_syncing_object_add_cylinder(self): """ See if new objects are added to the correct collection diff --git a/tests/python/render_layer/test_object_add_empty.py b/tests/python/view_layer/test_object_add_empty.py index e4f3c94f8a5..376d9361319 100644 --- a/tests/python/render_layer/test_object_add_empty.py +++ b/tests/python/view_layer/test_object_add_empty.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_syncing_object_add_empty(self): """ See if new objects are added to the correct collection diff --git a/tests/python/render_layer/test_object_add_no_collection_cylinder.py b/tests/python/view_layer/test_object_add_no_collection_cylinder.py index f0770cb15e5..d6138040092 100644 --- a/tests/python/render_layer/test_object_add_no_collection_cylinder.py +++ b/tests/python/view_layer/test_object_add_no_collection_cylinder.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_object_add_cylinder(self): """ See if new objects are added to the correct collection diff --git a/tests/python/render_layer/test_object_add_no_collection_empty.py b/tests/python/view_layer/test_object_add_no_collection_empty.py index cc5bfbe8562..4c4ed45dfe8 100644 --- a/tests/python/render_layer/test_object_add_no_collection_empty.py +++ b/tests/python/view_layer/test_object_add_no_collection_empty.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_syncing_object_add_empty(self): """ See if new objects are added to the correct collection diff --git a/tests/python/render_layer/test_object_add_no_collection_torus.py b/tests/python/view_layer/test_object_add_no_collection_torus.py index c87acfbc996..0bb6b03692d 100644 --- a/tests/python/render_layer/test_object_add_no_collection_torus.py +++ b/tests/python/view_layer/test_object_add_no_collection_torus.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_syncing_object_add_torus(self): """ See if new objects are added to the correct collection diff --git a/tests/python/render_layer/test_object_add_torus.py b/tests/python/view_layer/test_object_add_torus.py index a92c42bc926..7ee138bb93e 100644 --- a/tests/python/render_layer/test_object_add_torus.py +++ b/tests/python/view_layer/test_object_add_torus.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_syncing_object_add_torus(self): """ See if new objects are added to the correct collection diff --git a/tests/python/render_layer/test_object_copy.py b/tests/python/view_layer/test_object_copy.py index 1e6e9e5b889..eab2c73f3b3 100644 --- a/tests/python/render_layer/test_object_copy.py +++ b/tests/python/view_layer/test_object_copy.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def do_object_copy(self, mode): import bpy import os @@ -38,11 +38,11 @@ class UnitTesting(RenderLayerTesting): scorpion = subzero.collections.new('scorpion') subzero.objects.link(three_b) scorpion.objects.link(three_c) - layer = scene.render_layers.new('Fresh new Layer') + layer = scene.view_layers.new('Fresh new Layer') layer.collections.link(subzero) - scene.render_layers.active_index = len(scene.render_layers) - 1 - bpy.context.workspace.render_layer = bpy.context.scene.render_layers['Fresh new Layer'] + scene.view_layers.active_index = len(scene.view_layers) - 1 + bpy.context.workspace.view_layer = bpy.context.scene.view_layers['Fresh new Layer'] if mode == 'DUPLICATE': # assuming the latest layer is the active layer diff --git a/tests/python/render_layer/test_object_delete_a.py b/tests/python/view_layer/test_object_delete_a.py index 60c3841a0ad..39304d1dcfc 100644 --- a/tests/python/render_layer/test_object_delete_a.py +++ b/tests/python/view_layer/test_object_delete_a.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_object_delete_data(self): """ See if objects are removed correctly from all related collections diff --git a/tests/python/render_layer/test_object_delete_b.py b/tests/python/view_layer/test_object_delete_b.py index 7bb8279f2f7..58dae9fc8a3 100644 --- a/tests/python/render_layer/test_object_delete_b.py +++ b/tests/python/view_layer/test_object_delete_b.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_object_delete_operator(self): """ See if new objects are added to the correct collection diff --git a/tests/python/render_layer/test_object_link_a.py b/tests/python/view_layer/test_object_link_a.py index 2106d4cd626..4f79e1c16ad 100644 --- a/tests/python/render_layer/test_object_link_a.py +++ b/tests/python/view_layer/test_object_link_a.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_object_link_scene(self): """ See if we can link objects diff --git a/tests/python/render_layer/test_object_link_b.py b/tests/python/view_layer/test_object_link_b.py index b18eb844fc4..3a7f9438071 100644 --- a/tests/python/render_layer/test_object_link_b.py +++ b/tests/python/view_layer/test_object_link_b.py @@ -6,21 +6,21 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_object_link_context(self): """ 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'] + bpy.context.scene.view_layers.active_index = len(bpy.context.scene.view_layers) - 1 + bpy.context.workspace.view_layer = bpy.context.scene.view_layers['Viewport'] master_collection = bpy.context.scene_collection self.do_object_link(master_collection) diff --git a/tests/python/render_layer/test_object_link_c.py b/tests/python/view_layer/test_object_link_c.py index ad69631dddc..f0118beaefe 100644 --- a/tests/python/render_layer/test_object_link_c.py +++ b/tests/python/view_layer/test_object_link_c.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_object_link_reload(self): """ See if we can link objects and not crash diff --git a/tests/python/render_layer/test_operator_context.py b/tests/python/view_layer/test_operator_context.py index 5055d957551..4c665b1d960 100644 --- a/tests/python/render_layer/test_operator_context.py +++ b/tests/python/view_layer/test_operator_context.py @@ -6,18 +6,18 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_operator_context(self): """ - See if render layer context is properly set/get with operators overrides - when we set render_layer in context, the collection should change as well + See if view layer context is properly set/get with operators overrides + when we set view_layer in context, the collection should change as well """ import bpy import os @@ -26,7 +26,7 @@ class UnitTesting(RenderLayerTesting): bl_idname = "testing.sample" bl_label = "Sample Operator" - render_layer = bpy.props.StringProperty( + view_layer = bpy.props.StringProperty( default="Not Set", options={'SKIP_SAVE'}, ) @@ -42,21 +42,21 @@ class UnitTesting(RenderLayerTesting): ) def execute(self, context): - render_layer = context.render_layer + view_layer = context.view_layer ret = {'FINISHED'} # this is simply playing safe - if render_layer.name != self.render_layer: + if view_layer.name != self.view_layer: if self.use_verbose: print('ERROR: Render Layer mismatch: "{0}" != "{1}"'.format( - render_layer.name, self.render_layer)) + view_layer.name, self.view_layer)) ret = {'CANCELLED'} scene_collection_name = None if self.scene_collection: scene_collection_name = self.scene_collection else: - scene_collection_name = render_layer.collections.active.name + scene_collection_name = view_layer.collections.active.name # while this is the real test if context.scene_collection.name != scene_collection_name: @@ -82,7 +82,7 @@ class UnitTesting(RenderLayerTesting): scorpion = subzero.collections.new('scorpion') subzero.objects.link(three_b) scorpion.objects.link(three_c) - layer = scene.render_layers.new('Fresh new Layer') + layer = scene.view_layers.new('Fresh new Layer') layer.collections.unlink(layer.collections.active) layer.collections.link(subzero) layer.collections.active_index = 3 @@ -90,33 +90,33 @@ class UnitTesting(RenderLayerTesting): # Change active scene layer (do it for workspace too just to don't get mangled in workspace bugs) 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'] + scene.view_layers.active_index = len(scene.view_layers) - 2 + self.assertEqual(scene.view_layers.active.name, "Viewport") + bpy.context.workspace.view_layer = bpy.context.scene.view_layers['Viewport'] # old layer - self.assertEqual(bpy.ops.testing.sample(render_layer='Viewport', use_verbose=True), {'FINISHED'}) + self.assertEqual(bpy.ops.testing.sample(view_layer='Viewport', use_verbose=True), {'FINISHED'}) # expected to fail - self.assertTrue(bpy.ops.testing.sample(render_layer=layer.name), {'CANCELLED'}) + self.assertTrue(bpy.ops.testing.sample(view_layer=layer.name), {'CANCELLED'}) - # set render layer and scene collection + # set view layer and scene collection override = bpy.context.copy() - override["render_layer"] = layer + override["view_layer"] = layer override["scene_collection"] = subzero self.assertEqual(bpy.ops.testing.sample( override, - render_layer=layer.name, + view_layer=layer.name, scene_collection=subzero.name, # 'sub-zero' use_verbose=True), {'FINISHED'}) - # set only render layer + # set only view layer override = bpy.context.copy() - override["render_layer"] = layer + override["view_layer"] = layer self.assertEqual(bpy.ops.testing.sample( override, - render_layer=layer.name, + view_layer=layer.name, scene_collection=layer.collections.active.name, # 'scorpion' use_verbose=True), {'FINISHED'}) diff --git a/tests/python/render_layer/test_scene_copy_a.py b/tests/python/view_layer/test_scene_copy_a.py index 9fcf264feb5..8cccb26a92d 100644 --- a/tests/python/render_layer/test_scene_copy_a.py +++ b/tests/python/view_layer/test_scene_copy_a.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_scene_collections_copy_full(self): """ See if scene copying 'FULL_COPY' is working for scene collections diff --git a/tests/python/render_layer/test_scene_copy_b.py b/tests/python/view_layer/test_scene_copy_b.py index 1184655223b..1d53b56719d 100644 --- a/tests/python/render_layer/test_scene_copy_b.py +++ b/tests/python/view_layer/test_scene_copy_b.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_scene_collections_link(self): """ See if scene copying 'LINK_OBJECTS' is working for scene collections diff --git a/tests/python/render_layer/test_scene_copy_c.py b/tests/python/view_layer/test_scene_copy_c.py index b446464b1c2..c9bb0924848 100644 --- a/tests/python/render_layer/test_scene_copy_c.py +++ b/tests/python/view_layer/test_scene_copy_c.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_scene_layers_copy(self): """ See if scene copying 'FULL_COPY' is working for scene layers diff --git a/tests/python/render_layer/test_scene_copy_d.py b/tests/python/view_layer/test_scene_copy_d.py index f398650eade..6efd93c7659 100644 --- a/tests/python/render_layer/test_scene_copy_d.py +++ b/tests/python/view_layer/test_scene_copy_d.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_scene_layers_link(self): """ See if scene copying 'LINK_OBJECTS' is working for scene layers diff --git a/tests/python/render_layer/test_scene_copy_e.py b/tests/python/view_layer/test_scene_copy_e.py index 8e1afb1b2ea..23d01b6a84b 100644 --- a/tests/python/render_layer/test_scene_copy_e.py +++ b/tests/python/view_layer/test_scene_copy_e.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_shared_layer_collections_copy_full(self): """ See if scene copying 'FULL_COPY' is working for scene collections @@ -23,14 +23,14 @@ class UnitTesting(RenderLayerTesting): import bpy scene = bpy.context.scene - layer = bpy.context.render_layer + layer = bpy.context.view_layer original_cube = layer.objects.get('Cube') original_cube.select_set('SELECT') self.assertTrue(original_cube.select_get()) bpy.ops.scene.new(type='FULL_COPY') - new_layer = bpy.context.render_layer + new_layer = bpy.context.view_layer self.assertNotEqual(layer, new_layer) new_cube = new_layer.objects.get('Cube.001') diff --git a/tests/python/render_layer/test_scene_copy_f.py b/tests/python/view_layer/test_scene_copy_f.py index fd4298675f2..726861df9ba 100644 --- a/tests/python/render_layer/test_scene_copy_f.py +++ b/tests/python/view_layer/test_scene_copy_f.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_shared_layer_collections_copy_full(self): """ See if scene copying 'FULL_COPY' is keeping collections visibility @@ -32,7 +32,7 @@ class UnitTesting(RenderLayerTesting): new_collections = [] # clean everything - for layer in scene.render_layers: + for layer in scene.view_layers: while layer.collections: layer.collections.unlink(layer.collections[0]) @@ -45,7 +45,7 @@ class UnitTesting(RenderLayerTesting): sub_collection = collection.collections.new("{0}:{1}".format(i, j)) # link to the original scene - for layer in scene.render_layers: + for layer in scene.view_layers: for i, collection in enumerate(new_collections): layer.collections.link(collection) self.assertEqual(layer.collections[-1], layer.collections[i]) @@ -66,8 +66,8 @@ class UnitTesting(RenderLayerTesting): scene.update() # update depsgraph # compare scenes - for h, layer in enumerate(scene.render_layers): - new_layer = new_scene.render_layers[h] + for h, layer in enumerate(scene.view_layers): + new_layer = new_scene.view_layers[h] for i, collection in enumerate(layer.collections): new_collection = new_layer.collections[i] diff --git a/tests/python/render_layer/test_scene_delete.py b/tests/python/view_layer/test_scene_delete.py index cd59a446c9a..4e63b9698b9 100644 --- a/tests/python/render_layer/test_scene_delete.py +++ b/tests/python/view_layer/test_scene_delete.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def test_scene_delete(self): """ See if a scene can be properly deleted diff --git a/tests/python/render_layer/test_scene_write_read.py b/tests/python/view_layer/test_scene_write_read.py index 3338aff291a..6c750d87987 100644 --- a/tests/python/render_layer/test_scene_write_read.py +++ b/tests/python/view_layer/test_scene_write_read.py @@ -6,14 +6,14 @@ import unittest import os import sys -from render_layer_common import * +from view_layer_common import * # ############################################################ # Testing # ############################################################ -class UnitTesting(RenderLayerTesting): +class UnitTesting(ViewLayerTesting): def do_scene_write_read(self, filepath_layers, filepath_layers_json, data_callbacks, do_read): """ See if write/read is working for scene collections and layers diff --git a/tests/python/render_layer/render_layer_common.py b/tests/python/view_layer/view_layer_common.py index 7e8cbf988c8..166d683da5a 100644 --- a/tests/python/render_layer/render_layer_common.py +++ b/tests/python/view_layer/view_layer_common.py @@ -82,7 +82,7 @@ def get_layer(scene, layer): def get_layers(scene): """Return all the render layers and their data""" layers = {} - for layer in linkdata_iter(scene, b'render_layers'): + for layer in linkdata_iter(scene, b'view_layers'): name, data = get_layer(scene, layer) layers[name] = data return layers @@ -188,7 +188,7 @@ def compare_files(file_a, file_b): return True -class RenderLayerTesting(unittest.TestCase): +class ViewLayerTesting(unittest.TestCase): _test_simple = False _extra_arguments = [] @@ -258,7 +258,7 @@ class RenderLayerTesting(unittest.TestCase): scorpion = subzero.collections.new('scorpion') subzero.objects.link(three_b) scorpion.objects.link(three_c) - layer = scene.render_layers.new('Fresh new Layer') + layer = scene.view_layers.new('Fresh new Layer') layer.collections.link(subzero) # change active collection @@ -267,7 +267,7 @@ class RenderLayerTesting(unittest.TestCase): # change active layer override = bpy.context.copy() - override["render_layer"] = layer + override["view_layer"] = layer override["scene_collection"] = layer.collections.active.collection # add new objects @@ -308,7 +308,7 @@ class RenderLayerTesting(unittest.TestCase): # empty layer of collections - layer = bpy.context.render_layer + layer = bpy.context.view_layer while layer.collections: layer.collections.unlink(layer.collections[0]) @@ -439,9 +439,9 @@ class RenderLayerTesting(unittest.TestCase): bpy.data.objects.remove(ob, do_unlink=True) # real test - layer = scene.render_layers.new('Visibility Test') + layer = scene.view_layers.new('Visibility Test') layer.collections.unlink(layer.collections[0]) - scene.render_layers.active = layer + scene.view_layers.active = layer scene_collection = scene.master_collection.collections.new("Collection") layer.collections.link(scene_collection) @@ -468,14 +468,14 @@ class RenderLayerTesting(unittest.TestCase): def cleanup_tree(self): """ Remove any existent layer and collections, - leaving only the one render_layer we can't remove + leaving only the one view_layer we can't remove """ import bpy scene = bpy.context.scene - while len(scene.render_layers) > 1: - scene.render_layers.remove(scene.render_layers[1]) + while len(scene.view_layers) > 1: + scene.view_layers.remove(scene.view_layers[1]) - layer = scene.render_layers[0] + layer = scene.view_layers[0] while layer.collections: layer.collections.unlink(layer.collections[0]) @@ -503,9 +503,9 @@ class RenderLayerTesting(unittest.TestCase): self.rename_collections(nested_collection) -class MoveSceneCollectionTesting(RenderLayerTesting): +class MoveSceneCollectionTesting(ViewLayerTesting): """ - To be used by tests of render_layer_move_into_scene_collection + To be used by tests of view_layer_move_into_scene_collection """ def get_initial_scene_tree_map(self): collections_map = [ @@ -593,7 +593,7 @@ class MoveSceneCollectionTesting(RenderLayerTesting): class MoveSceneCollectionSyncTesting(MoveSceneCollectionTesting): """ - To be used by tests of render_layer_move_into_scene_collection_sync + To be used by tests of view_layer_move_into_scene_collection_sync """ def get_initial_layers_tree_map(self): layers_map = [ @@ -630,7 +630,7 @@ class MoveSceneCollectionSyncTesting(MoveSceneCollectionTesting): layers_map = self.get_initial_layers_tree_map() for layer_name, collections_names in layers_map: - layer = scene.render_layers.new(layer_name) + layer = scene.view_layers.new(layer_name) layer.collections.unlink(layer.collections[0]) for collection_name in collections_names: @@ -649,7 +649,7 @@ class MoveSceneCollectionSyncTesting(MoveSceneCollectionTesting): layers_map = self.get_reference_layers_tree_map() for layer_name, collections_names in layers_map: - layer = scene.render_layers.get(layer_name) + layer = scene.view_layers.get(layer_name) self.assertTrue(layer) self.assertEqual(len(collections_names), len(layer.collections)) @@ -672,17 +672,17 @@ class MoveSceneCollectionSyncTesting(MoveSceneCollectionTesting): class MoveLayerCollectionTesting(MoveSceneCollectionSyncTesting): """ - To be used by tests of render_layer_move_into_layer_collection + To be used by tests of view_layer_move_into_layer_collection """ def parse_move(self, path, sep='.'): """ convert 'Layer 1.C.2' into: - bpy.context.scene.render_layers['Layer 1'].collections['C'].collections['2'] + bpy.context.scene.view_layers['Layer 1'].collections['C'].collections['2'] """ import bpy paths = path.split(sep) - layer = bpy.context.scene.render_layers[paths[0]] + layer = bpy.context.scene.view_layers[paths[0]] collections = layer.collections for subpath in paths[1:]: @@ -757,15 +757,15 @@ class Clay: self._scene.master_collection.collections.remove( self._scene.master_collection.collections[0]) - layer = self._scene.render_layers.new('Evaluation Test') + layer = self._scene.view_layers.new('Evaluation Test') layer.collections.unlink(layer.collections[0]) - self._scene.render_layers.active = layer - bpy.context.workspace.render_layer = layer + self._scene.view_layers.active = layer + bpy.context.workspace.view_layer = layer # remove all other layers - for layer_iter in self._scene.render_layers: + for layer_iter in self._scene.view_layers: if layer_iter != layer: - self._scene.render_layers.remove(layer_iter) + self._scene.view_layers.remove(layer_iter) return layer |