[Bf-blender-cvs] [3abe8b3292c] blender2.8: Rename any instance of scene layer or render layer in code with view layer

Dalai Felinto noreply at git.blender.org
Thu Nov 23 10:55:07 CET 2017


Commit: 3abe8b3292cf7a50a9200b95401993384df24d9a
Author: Dalai Felinto
Date:   Wed Nov 22 10:52:39 2017 -0200
Branches: blender2.8
https://developer.blender.org/rB3abe8b3292cf7a50a9200b95401993384df24d9a

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

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

M	intern/cycles/blender/addon/properties.py
M	intern/cycles/blender/addon/ui.py
M	intern/cycles/blender/blender_curves.cpp
M	intern/cycles/blender/blender_mesh.cpp
M	intern/cycles/blender/blender_object.cpp
M	intern/cycles/blender/blender_session.cpp
M	intern/cycles/blender/blender_session.h
M	intern/cycles/blender/blender_shader.cpp
M	intern/cycles/blender/blender_sync.cpp
M	intern/cycles/blender/blender_sync.h
M	intern/cycles/blender/blender_texture.cpp
M	intern/cycles/blender/blender_texture.h
M	intern/cycles/blender/blender_util.h
M	release/scripts/freestyle/modules/parameter_editor.py
M	release/scripts/modules/bpy_extras/object_utils.py
M	release/scripts/presets/keyconfig/3dsmax.py
M	release/scripts/presets/keyconfig/maya.py
M	release/scripts/startup/bl_operators/clip.py
M	release/scripts/startup/bl_operators/freestyle.py
M	release/scripts/startup/bl_ui/__init__.py
M	release/scripts/startup/bl_ui/properties_data_workspace.py
M	release/scripts/startup/bl_ui/properties_freestyle.py
M	release/scripts/startup/bl_ui/properties_object.py
R084	release/scripts/startup/bl_ui/properties_render_layer.py	release/scripts/startup/bl_ui/properties_view_layer.py
M	release/scripts/startup/bl_ui/space_image.py
M	release/scripts/startup/bl_ui/space_info.py
M	release/scripts/startup/bl_ui/space_node.py
M	source/blender/alembic/intern/abc_exporter.cc
M	source/blender/alembic/intern/abc_exporter.h
M	source/blender/alembic/intern/alembic_capi.cc
M	source/blender/blenkernel/BKE_blender_version.h
M	source/blender/blenkernel/BKE_camera.h
M	source/blender/blenkernel/BKE_context.h
M	source/blender/blenkernel/BKE_dynamicpaint.h
M	source/blender/blenkernel/BKE_layer.h
M	source/blender/blenkernel/BKE_modifier.h
M	source/blender/blenkernel/BKE_node.h
M	source/blender/blenkernel/BKE_object.h
M	source/blender/blenkernel/BKE_paint.h
M	source/blender/blenkernel/BKE_particle.h
M	source/blender/blenkernel/BKE_pointcache.h
M	source/blender/blenkernel/BKE_scene.h
M	source/blender/blenkernel/BKE_sequencer.h
M	source/blender/blenkernel/BKE_workspace.h
M	source/blender/blenkernel/intern/DerivedMesh.c
M	source/blender/blenkernel/intern/anim.c
M	source/blender/blenkernel/intern/blender_copybuffer.c
M	source/blender/blenkernel/intern/blendfile.c
M	source/blender/blenkernel/intern/camera.c
M	source/blender/blenkernel/intern/collection.c
M	source/blender/blenkernel/intern/context.c
M	source/blender/blenkernel/intern/dynamicpaint.c
M	source/blender/blenkernel/intern/effect.c
M	source/blender/blenkernel/intern/layer.c
M	source/blender/blenkernel/intern/library_query.c
M	source/blender/blenkernel/intern/linestyle.c
M	source/blender/blenkernel/intern/mball.c
M	source/blender/blenkernel/intern/object.c
M	source/blender/blenkernel/intern/object_dupli.c
M	source/blender/blenkernel/intern/paint.c
M	source/blender/blenkernel/intern/particle.c
M	source/blender/blenkernel/intern/particle_system.c
M	source/blender/blenkernel/intern/pointcache.c
M	source/blender/blenkernel/intern/scene.c
M	source/blender/blenkernel/intern/sequencer.c
M	source/blender/blenkernel/intern/smoke.c
M	source/blender/blenkernel/intern/softbody.c
M	source/blender/blenkernel/intern/sound.c
M	source/blender/blenkernel/intern/tracking.c
M	source/blender/blenkernel/intern/workspace.c
M	source/blender/blenloader/BLO_readfile.h
M	source/blender/blenloader/intern/readfile.c
M	source/blender/blenloader/intern/versioning_280.c
M	source/blender/blenloader/intern/versioning_defaults.c
M	source/blender/blenloader/intern/versioning_legacy.c
M	source/blender/blenloader/intern/writefile.c
M	source/blender/collada/DocumentImporter.cpp
M	source/blender/collada/collada.cpp
M	source/blender/collada/collada.h
M	source/blender/collada/collada_utils.cpp
M	source/blender/compositor/nodes/COM_RenderLayersNode.cpp
M	source/blender/compositor/operations/COM_RenderLayersProg.cpp
M	source/blender/depsgraph/CMakeLists.txt
M	source/blender/depsgraph/DEG_depsgraph.h
M	source/blender/depsgraph/DEG_depsgraph_build.h
M	source/blender/depsgraph/DEG_depsgraph_debug.h
M	source/blender/depsgraph/DEG_depsgraph_query.h
M	source/blender/depsgraph/intern/builder/deg_builder_nodes.h
M	source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
R088	source/blender/depsgraph/intern/builder/deg_builder_nodes_scene_layer.cc	source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations.h
M	source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc
R089	source/blender/depsgraph/intern/builder/deg_builder_relations_scene_layer.cc	source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
M	source/blender/depsgraph/intern/depsgraph.cc
M	source/blender/depsgraph/intern/depsgraph.h
M	source/blender/depsgraph/intern/depsgraph_build.cc
M	source/blender/depsgraph/intern/depsgraph_debug.cc
M	source/blender/depsgraph/intern/depsgraph_eval.cc
M	source/blender/depsgraph/intern/depsgraph_query.cc
M	source/blender/depsgraph/intern/depsgraph_tag.cc
M	source/blender/depsgraph/intern/depsgraph_type_defines.cc
M	source/blender/depsgraph/intern/depsgraph_types.h
M	source/blender/depsgraph/intern/eval/deg_eval.cc
M	source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
M	source/blender/draw/DRW_engine.h
M	source/blender/draw/engines/clay/clay_engine.c
M	source/blender/draw/engines/eevee/eevee_bloom.c
M	source/blender/draw/engines/eevee/eevee_data.c
M	source/blender/draw/engines/eevee/eevee_depth_of_field.c
M	source/blender/draw/engines/eevee/eevee_effects.c
M	source/blender/draw/engines/eevee/eevee_engine.c
M	source/blender/draw/engines/eevee/eevee_lightprobes.c
M	source/blender/draw/engines/eevee/eevee_lights.c
M	source/blender/draw/engines/eevee/eevee_materials.c
M	source/blender/draw/engines/eevee/eevee_motion_blur.c
M	source/blender/draw/engines/eevee/eevee_occlusion.c
M	source/blender/draw/engines/eevee/eevee_private.h
M	source/blender/draw/engines/eevee/eevee_screen_raytrace.c
M	source/blender/draw/engines/eevee/eevee_subsurface.c
M	source/blender/draw/engines/eevee/eevee_temporal_sampling.c
M	source/blender/draw/engines/eevee/eevee_volumes.c
M	source/blender/draw/intern/DRW_render.h
M	source/blender/draw/intern/draw_armature.c
M	source/blender/draw/intern/draw_common.c
M	source/blender/draw/intern/draw_common.h
M	source/blender/draw/intern/draw_manager.c
M	source/blender/draw/intern/draw_view.c
M	source/blender/draw/modes/object_mode.c
M	source/blender/editors/animation/anim_channels_edit.c
M	source/blender/editors/animation/anim_filter.c
M	source/blender/editors/animation/anim_markers.c
M	source/blender/editors/armature/armature_relations.c
M	source/blender/editors/armature/armature_select.c
M	source/blender/editors/armature/editarmature_sketch.c
M	source/blender/editors/armature/pose_select.c
M	source/blender/editors/curve/editcurve.c
M	source/blender/editors/curve/editcurve_paint.c
M	source/blender/editors/curve/editfont.c
M	source/blender/editors/gpencil/drawgpencil.c
M	source/blender/editors/gpencil/gpencil_convert.c
M	source/blender/editors/gpencil/gpencil_utils.c
M	source/blender/editors/include/ED_anim_api.h
M	source/blender/editors/include/ED_armature.h
M	source/blender/editors/include/ED_gpencil.h
M	source/blender/editors/include/ED_image.h
M	source/blender/editors/include/ED_info.h
M	source/blender/editors/include/ED_object.h
M	source/blender/editors/include/ED_particle.h
M	source/blender/editors/include/ED_scene.h
M	source/blender/editors/include/ED_screen.h
M	source/blender/editors/include/ED_transform_snap_object_context.h
M	source/blender/editors/include/ED_uvedit.h
M	source/blender/editors/include/ED_view3d.h
M	source/blender/editors/interface/interface_handlers.c
M	source/blender/editors/io/io_collada.c
M	source/blender/editors/mesh/editmesh_tools.c
M	source/blender/editors/mesh/mesh_navmesh.c
M	source/blender/editors/object/object_add.c
M	source/blender/editors/object/object_bake.c
M	source/blender/editors/object/object_constraint.c
M	source/blender/editors/object/object_edit.c
M	source/blender/editors/object/object_group.c
M	source/blender/editors/object/object_hook.c
M	source/blender/editors/object/object_modifier.c
M	source/blender/editors/object/object_relations.c
M	source/blender/editors/object/object_select.c
M	source/blender/editors/physics/dynamicpaint_ops.c
M	source/blender/editors/physics/particle_edit.c
M	source/blender/editors/physics/particle_object.c
M	source/blender/editors/physics/physics_fluid.c
M	source/blender/editors/physics/physics_pointcache.c
M	source/blender/editors/physics/rigidbody_constraint.c
M	source/blender/editors/render/render_intern.h
M	source/blender/editors/render/render_internal.c
M	source/blender/editors/render/render_opengl.c
M	source/blender/editors/render/render_ops.c
M	source/blender/editors/render/render_preview.c
M	source/blender/editors/render/render_shading.c
M	source/blender/editors/render/render_update.c
M	source/blender/editors/scene/scene_edit.c
M	source/blender/editors/screen/screen_context.c
M	source/blender/editors/screen/screen_edit.c
M	source/blender/editors/screen/screen_ops.c
M	source/blender/editors/screen/workspace_edit.c
M	source/blender/editors/sculpt_paint/paint_image.c
M	source/blender/editors/sculpt_paint/paint_image_proj.c
M	source/blender/editors/sculpt_paint/paint_utils.c
M	source/blender/editors/sound/sound_ops.c
M	source/blender/editors/space_buttons/buttons_context.c
M	source/blender/editors/space_buttons/buttons_texture.c
M	source/blender/editors/space_buttons/space_buttons.c
M	source/blender/editors/space_clip/tracking_ops_orient.c
M	source/blender/editors/space_image/image_edit.c
M	source/blender/editors/space_image/image_intern.h
M	source/blender/editors/space_image/image_ops.c
M	source/blender/editors/space_image/space_image.c
M	source/blender/editors/space_info/info_stats.c
M	source/blender/editors/space_logic/logic_window.c
M	source/blender/editors/space_nla/nla_channels.c
M	source/blender/editors/space_node/drawnode.c
M	source/blender/editors/space_node/node_edit.c
M	source/blender/editors/space_node/node_intern.h
M	source/blender/editors/space_node/node_ops.c
M	source/blender/editors/space_outliner/outliner_collections.c
M	source/blender/editors/space_outliner/outliner_draw.c
M	source/blender/editors/space_outliner/outliner_edit.c
M	source/blender/editors/space_outliner/outliner_intern.h
M	source/blender/editors/space_outliner/outliner_select.c
M	source/blender/editors/space_outliner/outliner_tools.c
M	source/blender/editors/space_outliner/outliner_tree.c
M	source/blender/editors/space_outliner/space_outliner.c
M	source/blender/editors/space_time/space_time.c
M	source/blender/editors/space_view3d/drawarmature.c
M	source/blender/editors/space_view3d/drawmesh.c
M	source/blender/editors/space_view3d/drawobject.c
M	source/blender/editors/space_view3d/space_view3d.c
M	source/blender/editors/space_view3d/view3d_buttons.c
M	source/blender/editors/space_view3d/view3d_draw.c
M	source/blender/editors/space_view3d/view3d_draw_legacy.c
M	source/blender/editors/space_view3d/view3d_edit.c
M	source/blender/editors/space_view3d/view3d_header.c
M	source/blender/editors/space_view3d/view3d_intern.h
M	source/blender/editors/space_view3d/view3d_manipulator_camera.c
M	source/blender/editors/space_view3d/view3d_manipulator_ruler.c
M	source/blender/editors/space_view3d/view3d_ruler.c
M	source/blender/editors/space_view3d/view3d_select.c
M	source/blender/editors/space_view3d/view3d_view.c
M	source/blender/editors/space_view3d/view3d_walk.c
M	source/blender/editors/transform/transform.c
M	source/blender/editors/transform/transform.h
M	source/blender/editors/transform/transform_conversions.c
M	source/blender/editors/transform/transform_generics.c
M	source/blender/editors/transform/transform_manipulator.c
M	source/blender/editors/transform/transform_orientations.c
M	source/blender/editors/transform/transform_snap.c
M	source/blender/editors/transform/transform_snap_object.c
M	source/blender/editors/util/ed_util.c
M	source/blender/editors/util/undo.c
M	source/blender/editors/uvedit/uvedit_draw.c
M	source/blender/freestyle/CMakeLists.txt
M	source/blender/freestyle/FRS_freestyle.h
M	source/blender/freestyle/intern/application/Controller.cpp
M	source/blender/freestyle/intern/application/Controller.h
M	source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
M	source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
M	source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M	source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
R084	source/blender/freestyle/intern/scene_graph/NodeSceneLayer.cpp	source/blender/freestyle/intern/scene_graph/NodeViewLayer.cpp
R065	source/blender/freestyle/intern/scene_graph/NodeSceneLayer.h	source/blender/freestyle/intern/scene_graph/NodeViewLayer.h
M	source/blender/freestyle/intern/scene_graph/SceneHash.cpp
M	source/blender/freestyle/intern/scene_graph/SceneHash.h
M	source/blender/freestyle/intern/scene_graph/SceneVisitor.h
M	source/blender/gpu/GPU_draw.h
M	source/blender/gpu/intern/gpu_draw.c
M	source/blender/makesdna/DNA_fileglobal_types.h
M	source/blender/makesdna/DNA_layer_types.h
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesdna/DNA_space_types.h
M	source/blender/makesdna/DNA_workspace_types.h
M	source/blender/makesdna/intern/dna_genfile.c
M	source/blender/makesrna/RNA_access.h
M	source/blender/makesrna/RNA_types.h
M	source/blender/makesrna/intern/makesrna.c
M	source/blender/makesrna/intern/rna_brush.c
M	source/blender/makesrna/intern/rna_context.c
M	source/blender/makesrna/intern/rna_internal.h
M	source/blender/makesrna/intern/rna_layer.c
M	source/blender/makesrna/intern/rna_main_api.c
M	source/blender/makesrna/intern/rna_nodetree.c
M	source/blender/makesrna/intern/rna_object_api.c
M	source/blender/makesrna/intern/rna_object_force.c
M	source/blender/makesrna/intern/rna_particle.c
M	source/blender/makesrna/intern/rna_render.c
M	source/blender/makesrna/intern/rna_scene.c
M	source/blender/makesrna/intern/rna_scene_api.c
M	source/blender/makesrna/intern/rna_sculpt_paint.c
M	source/blender/makesrna/intern/rna_space.c
M	source/blender/makesrna/intern/rna_texture.c
M	source/blender/makesrna/intern/rna_workspace.c
M	source/blender/nodes/NOD_composite.h
M	source/blender/nodes/composite/node_composite_tree.c
M	source/blender/nodes/composite/nodes/node_composite_image.c
M	source/blender/nodes/shader/node_shader_tree.c
M	source/blender/nodes/texture/node_texture_tree.c
M	source/blender/python/intern/gpu_offscreen.c
M	source/blender/render/extern/include/RE_engine.h
M	source/blender/render/extern/include/RE_pipeline.h
M	source/blender/render/extern/include/RE_render_ext.h
M	source/blender/render/intern/include/render_types.h
M	source/blender/render/intern/include/rendercore.h
M	source/blender/render/intern/source/convertblender.c
M	source/blender/render/intern/source/envmap.c
M	source/blender/render/intern/source/external_engine.c
M	source/blender/render/intern/source/pipeline.c
M	source/blender/render/intern/source/pointdensity.c
M	source/blender/render/intern/source/render_result.c
M	source/blender/render/intern/source/rendercore.c
M	source/blender/windowmanager/intern/wm_event_system.c
M	source/blender/windowmanager/intern/wm_files.c
M	source/blender/windowmanager/intern/wm_files_link.c
M	source/blender/windowmanager/intern/wm_operators.c
M	source/blenderplayer/bad_level_call_stubs/stubs.c
M	source/creator/creator_args.c
M	tests/gtests/alembic/abc_export_test.cc
M	tests/python/CMakeLists.txt
D	tests/python/render_layer/CMakeLists.txt
A	tests/python/view_layer/CMakeLists.txt
R094	tests/python/render_layer/test_active_collection.py	tests/python/view_layer/test_active_collection.py
R097	tests/python/render_layer/test_collection_rename.py	tests/python/view_layer/test_collection_rename.py
R092	tests/python/render_layer/test_evaluation_render_settings_a.py	tests/python/view_layer/test_evaluation_render_settings_a.py
R093	tests/python/render_layer/test_evaluation_render_settings_b.py	tests/python/view_layer/test_evaluation_render_settings_b.py
R092	tests/python/render_layer/test_evaluation_render_settings_c.py	tests/python/view_layer/test_evaluation_render_settings_c.py
R092	tests/python/render_layer/test_evaluation_render_settings_d.py	tests/python/view_layer/test_evaluation_render_settings_d.py
R093	tests/python/render_layer/test_evaluation_render_settings_e.py	tests/python/view_layer/test_evaluation_render_settings_e.py
R093	tests/python/render_layer/test_evaluation_render_settings_f.py	tests/python/view_layer/test_evaluation_render_settings_f.py
R093	tests/python/render_layer/test_evaluation_render_settings_g.py	tests/python/view_layer/test_evaluation_render_settings_g.py
R093	tests/python/render_layer/test_evaluation_render_settings_h.py	tests/python/view_layer/test_evaluation_render_settings_h.py
R093	tests/python/render_layer/test_evaluation_render_settings_i.py	tests/python/view_layer/test_evaluation_render_settings_i.py
R088	tests/python/render_layer/test_evaluation_selectability_a.py	tests/python/view_layer/test_evaluation_selectability_a.py
R088	tests/python/render_layer/test_evaluation_selectability_b.py	tests/python/view_layer/test_evaluation_selectability_b.py
R088	tests/python/render_layer/test_evaluation_selectability_c.py	tests/python/view_layer/test_evaluation_selectability_c.py
R088	tests/python/render_layer/test_evaluation_selectability_d.py	tests/python/view_layer/test_evaluation_selectability_d.py
R088	tests/python/render_layer/test_evaluation_selectability_e.py	tests/python/view_layer/test_evaluation_selectability_e.py
R088	tests/python/render_layer/test_evaluation_selectability_f.py	tests/python/view_layer/test_evaluation_selectability_f.py
R088	tests/python/render_layer/test_evaluation_visibility_a.py	tests/python/view_layer/test_evaluation_visibility_a.py
R088	tests/python/render_layer/test_evaluation_visibility_b.py	tests/python/view_layer/test_evaluation_visibility_b.py
R088	tests/python/render_layer/test_evaluation_visibility_c.py	tests/python/view_layer/test_evaluation_visibility_c.py
R087	tests/python/render_layer/test_evaluation_visibility_d.py	tests/python/view_layer/test_evaluation_visibility_d.py
R088	tests/python/render_layer/test_evaluation_visibility_e.py	tests/python/view_layer/test_evaluation_visibility_e.py
R088	tests/python/render_layer/test_evaluation_visibility_f.py	tests/python/view_layer/test_evaluation_visibility_f.py
R091	tests/python/render_layer/test_evaluation_visibility_g.py	tests/python/view_layer/test_evaluation_visibility_g.py
R091	tests/python/render_layer/test_evaluation_visibility_h.py	tests/python/view_layer/test_evaluation_visibility_h.py
R091	tests/python/render_layer/test_evaluation_visibility_i.py	tests/python/view_layer/test_evaluation_visibility_i.py
R096	tests/python/render_layer/test_layer_linking.py	tests/python/view_layer/test_layer_linking.py
R098	tests/python/render_layer/test_layer_syncing.py	tests/python/view_layer/test_layer_syncing.py
R097	tests/python/render_layer/test_move_above_below_layer_collection_a.py	tests/python/view_layer/test_move_above_below_layer_collection_a.py
R097	tests/python/render_layer/test_move_above_below_layer_collection_b.py	tests/python/view_layer/test_move_above_below_layer_collection_b.py
R097	tests/python/render_layer/test_move_above_below_layer_collection_c.py	tests/python/view_layer/test_move_above_below_layer_collection_c.py
R097	tests/python/render_layer/test_move_above_below_layer_collection_d.py	tests/python/view_layer/test_move_above_below_layer_collection_d.py
R097	tests/python/render_layer/test_move_above_below_layer_collection_e.py	tests/python/view_layer/test_move_above_below_layer_collection_e.py
R098	tests/python/render_layer/test_move_above_below_layer_collection_f.py	tests/python/view_layer/test_move_above_below_layer_collection_f.py
R098	tests/python/render_layer/test_move_above_below_layer_collection_g.py	tests/python/view_layer/test_move_above_below_layer_collection_g.py
R098	tests/python/render_layer/test_move_above_below_layer_collection_h.py	tests/python/view_layer/test_move_above_below_layer_collection_h.py
R098	tests/python/render_layer/test_move_above_below_layer_collection_i.py	tests/python/view_layer/test_move_above_below_layer_collection_i.py
R098	tests/python/render_layer/test_move_above_below_layer_collection_j.py	tests/python/view_layer/test_move_above_below_layer_collection_j.py
R097	tests/python/render_layer/test_move_above_below_layer_collection_k.py	tests/python/view_layer/test_move_above_below_layer_collection_k.py
R098	tests/python/render_layer/test_move_above_below_layer_collection_l.py	tests/python/view_layer/test_move_above_below_layer_collection_l.py
R098	tests/python/render_layer/test_move_above_below_scene_collection_a.py	tests/python/view_layer/test_move_above_below_scene_collection_a.py
R098	tests/python/render_layer/test_move_above_below_scene_collection_b.py	tests/python/view_layer/test_move_above_below_scene_collection_b.py
R097	tests/python/render_layer/test_move_above_below_scene_collection_c.py	tests/python/view_layer/test_move_above_below_scene_collection_c.py
R098	tests/python/render_layer/test_move_above_below_scene_collection_d.py	tests/python/view_layer/test_move_above_below_scene_collection_d.py
R098	tests/python/render_layer/test_move_above_below_scene_collection_e.py	tests/python/view_layer/test_move_above_below_scene_collection_e.py
R097	tests/python/render_layer/test_move_above_below_scene_collection_f.py	tests/python/view_layer/test_move_above_below_scene_collection_f.py
R097	tests/python/render_layer/test_move_above_below_scene_collection_g.py	tests/python/view_layer/test_move_above_below_scene_collection_g.py
R098	tests/python/render_layer/test_move_above_below_scene_collection_h.py	tests/python/view_layer/test_move_above_below_scene_collection_h.py
R098	tests/python/render_layer/test_move_above_below_scene_collection_i.py	tests/python/view_layer/test_move_above_below_scene_collection_i.py
R098	tests/python/render_layer/test_move_above_below_scene_collection_sync_a.py	tests/python/view_layer/test_move_above_below_scene_collection_sync_a.py
R098	tests/python/render_layer/test_move_above_below_scene_collection_sync_b.py	tests/python/view_layer/test_move_above_below_scene_collection_sync_b.py
R097	tests/python/render_layer/test_move_above_below_scene_collection_sync_c.py	tests/python/view_layer/test_move_above_below_scene_collection_sync_c.py
R098	tests/python/render_layer/test_move_above_below_scene_collection_sync_d.py	tests/python/view_layer/test_move_above_below_scene_collection_sync_d.py
R098	tests/python/render_layer/test_move_above_below_scene_collection_sync_e.py	tests/python/view_layer/test_move_above_below_scene_collection_sync_e.py
R097	tests/python/render_layer/test_move_above_below_scene_collection_sync_f.py	tests/python/view_layer/test_move_above_below_scene_collection_sync_f.py
R097	tests/python/render_layer/test_move_above_below_scene_collection_sync_g.py	tests/python/view_layer/test_move_above_below_scene_collection_sync_g.py
R098	tests/python/render_layer/test_move_above_below_scene_collection_sync_h.py	tests/python/view_layer/test_move_above_below_scene_collection_sync_h.py
R098	tests/python/render_layer/test_move_above_below_scene_collection_sync_i.py	tests/python/view_layer/test_move_above_below_scene_collection_sync_i.py
R098	tests/python/render_layer/test_move_into_layer_collection_a.py	tests/python/view_layer/test_move_into_layer_collection_a.py
R097	tests/python/render_layer/test_move_into_layer_collection_b.py	tests/python/view_layer/test_move_into_layer_collection_b.py
R097	tests/python/render_layer/test_move_into_layer_collection_c.py	tests/python/view_layer/test_move_into_layer_collection_c.py
R097	tests/python/render_layer/test_move_into_layer_collection_d.py	tests/python/view_layer/test_move_into_layer_collection_d.py
R097	tests/python/render_layer/test_move_into_layer_collection_e.py	tests/python/view_layer/test_move_into_layer_collection_e.py
R098	tests/python/render_layer/test_move_into_layer_collection_f.py	tests/python/view_layer/test_move_into_layer_collection_f.py
R098	tests/python/render_layer/test_move_into_layer_collection_g.py	tests/python/view_layer/test_move_into_layer_collection_g.py
R098	tests/python/render_layer/test_move_into_layer_collection_h.py	tests/python/view_layer/test_move_into_layer_collection_h.py
R097	tests/python/render_layer/test_move_into_layer_collection_i.py	tests/python/view_layer/test_move_into_layer_collection_i.py
R097	tests/python/render_layer/test_move_into_layer_collection_j.py	tests/python/view_layer/test_move_into_layer_collection_j.py
R097	tests/python/render_layer/test_move_into_scene_collection_a.py	tests/python/view_layer/test_move_into_scene_collection_a.py
R097	tests/python/render_layer/test_move_into_scene_collection_b.py	tests/python/view_layer/test_move_into_scene_collection_b.py
R097	tests/python/render_layer/test_move_into_scene_collection_c.py	tests/python/view_layer/test_move_into_scene_collection_c.py
R097	tests/python/render_layer/test_move_into_scene_collection_d.py	tests/python/view_layer/test_move_into_scene_collection_d.py
R097	tests/python/render_layer/test_move_into_scene_collection_e.py	tests/python/view_layer/test_move_into_scene_collection_e.py
R097	tests/python/render_layer/test_move_into_scene_collection_f.py	tests/python/view_layer/test_move_into_scene_collection_f.py
R097	tests/python/render_layer/test_move_into_scene_collection_g.py	tests/python/view_layer/test_move_into_scene_collection_g.py
R097	tests/python/render_layer/test_move_into_scene_collection_h.py	tests/python/view_layer/test_move_into_scene_collection_h.py
R097	tests/python/render_layer/test_move_into_scene_collection_i.py	tests/python/view_layer/test_move_into_scene_collection_i.py
R097	tests/python/render_layer/test_move_into_scene_collection_j.py	tests/python/view_layer/test_move_into_scene_collection_j.py
R096	tests/python/render_layer/test_move_into_scene_collection_k.py	tests/python/view_layer/test_move_into_scene_collection_k.py
R096	tests/python/render_layer/test_move_into_scene_collection_l.py	tests/python/view_layer/test_move_into_scene_collection_l.py
R096	tests/python/render_layer/test_move_into_scene_collection_sync_a.py	tests/python/view_layer/test_move_into_scene_collection_sync_a.py
R097	tests/python/render_layer/test_move_into_scene_collection_sync_b.py	tests/python/view_layer/test_move_into_scene_collection_sync_b.py
R097	tests/python/render_layer/test_move_into_scene_collection_sync_c.py	tests/python/view_layer/test_move_into_scene_collection_sync_c.py
R097	tests/python/render_layer/test_move_into_scene_collection_sync_d.py	tests/python/view_layer/test_move_into_scene_collection_sync_d.py
R097	tests/python/render_layer/test_move_into_scene_collection_sync_e.py	tests/python/view_layer/test_move_into_scene_collection_sync_e.py
R097	tests/python/render_layer/test_move_into_scene_collection_sync_f.py	tests/python/view_layer/test_move_into_scene_collection_sync_f.py
R097	tests/python/render_layer/test_move_into_scene_collection_sync_g.py	tests/python/view_layer/test_move_into_scene_collection_sync_g.py
R097	tests/python/render_layer/test_move_into_scene_collection_sync_h.py	tests/python/view_layer/test_move_into_scene_collection_sync_h.py
R097	tests/python/render_layer/test_move_into_scene_collection_sync_i.py	tests/python/view_layer/test_move_into_scene_collection_sync_i.py
R097	tests/python/render_layer/test_move_into_scene_collection_sync_j.py	tests/python/view_layer/test_move_into_scene_collection_sync_j.py
R096	tests/python/render_layer/test_move_into_scene_collection_sync_k.py	tests/python/view_layer/test_move_into_scene_collection_sync_k.py
R096	tests/python/render_layer/test_move_into_scene_collection_sync_l.py	tests/python/view_layer/test_move_into_scene_collection_sync_l.py
R093	tests/python/render_layer/test_object_add_cylinder.py	tests/python/view_layer/test_object_add_cylinder.py
R093	tests/python/render_layer/test_object_add_empty.py	tests/python/view_layer/test_object_add_empty.py
R092	tests/python/render_layer/test_object_add_no_collection_cylinder.py	tests/python/view_layer/test_object_add_no_collection_cylinder.py
R092	tests/python/render_layer/test_object_add_no_collection_empty.py	tests/python/view_layer/test_object_add_no_collection_empty.py
R092	tests/python/render_layer/test_object_add_no_collection_torus.py	tests/python/view_layer/test_object_add_no_collection_torus.py
R093	tests/python/render_layer/test_object_add_torus.py	tests/python/view_layer/test_object_add_torus.py
R090	tests/python/render_layer/test_object_copy.py	tests/python/view_layer/test_object_copy.py
R092	tests/python/render_layer/test_object_delete_a.py	tests/python/view_layer/test_object_delete_a.py
R091	tests/python/render_layer/test_object_delete_b.py	tests/python/view_layer/test_object_delete_b.py
R092	tests/python/render_layer/test_object_link_a.py	tests/python/view_layer/test_object_link_a.py
R077	tests/python/render_layer/test_object_link_b.py	tests/python/view_layer/test_object_link_b.py
R092	tests/python/render_layer/test_object_link_c.py	tests/python/view_layer/test_object_link_c.py
R074	tests/python/render_layer/test_operator_context.py	tests/python/view_layer/test_operator_context.py
R093	tests/python/render_layer/test_scene_copy_a.py	tests/python/view_layer/test_scene_copy_a.py
R093	tests/python/render_layer/test_scene_copy_b.py	tests/python/view_layer/test_scene_copy_b.py
R093	tests/python/render_layer/test_scene_copy_c.py	tests/python/view_layer/test_scene_copy_c.py
R093	tests/python/render_layer/test_scene_copy_d.py	tests/python/view_layer/test_scene_copy_d.py
R088	tests/python/render_layer/test_scene_copy_e.py	tests/python/view_layer/test_scene_copy_e.py
R092	tests/python/render_layer/test_scene_copy_f.py	tests/python/view_layer/test_scene_copy_f.py
R093	tests/python/render_layer/test_scene_delete.py	tests/python/view_layer/test_scene_delete.py
R098	tests/python/render_layer/test_scene_write_read.py	tests/python/view_layer/test_scene_write_read.py
R094	tests/python/render_layer/render_layer_common.py	tests/python/view_layer/view_layer_common.py

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

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index aeeabe001e6..3ce8852abc2 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -1148,15 +1148,15 @@ class CyclesCurveRenderSettings(bpy.types.PropertyGroup):
 def update_render_passes(self, context):
     scene = context.scene
     rd = scene.render
-    rl = scene.render_layers.active
-    rl.update_render_passes()
+    view_layer = scene.view_layers.active
+    view_layer.update_render_passes()
 
 class CyclesRenderLayerSettings(bpy.types.PropertyGroup):
     @classmethod
     def register(cls):
-        bpy.types.SceneLayer.cycles = PointerProperty(
-                name="Cycles SceneRenderLayer Settings",
-                description="Cycles SceneLayer Settings",
+        bpy.types.ViewLayer.cycles = PointerProperty(
+                name="Cycles ViewLayer Settings",
+                description="Cycles ViewLayer Settings",
                 type=cls,
                 )
         cls.pass_debug_bvh_traversed_nodes = BoolProperty(
@@ -1280,7 +1280,7 @@ class CyclesRenderLayerSettings(bpy.types.PropertyGroup):
 
     @classmethod
     def unregister(cls):
-        del bpy.types.SceneLayer.cycles
+        del bpy.types.ViewLayer.cycles
 
 
 class CyclesCurveSettings(bpy.types.PropertyGroup):
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index b1e13de5e0c..79ed01191d8 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -400,8 +400,8 @@ class CYCLES_RENDER_PT_performance(CyclesButtonsPanel, Panel):
 
         subsub = sub.column()
         subsub.active = not rd.use_save_buffers
-        for rl in scene.render_layers:
-            if rl.cycles.use_denoising:
+        for view_layer in scene.view_layers:
+            if view_layer.cycles.use_denoising:
                 subsub.active = False
         subsub.prop(cscene, "use_progressive_refine")
 
@@ -430,24 +430,24 @@ class CYCLES_RENDER_PT_performance(CyclesButtonsPanel, Panel):
 
 class CYCLES_RENDER_PT_layer_options(CyclesButtonsPanel, Panel):
     bl_label = "Layer"
-    bl_context = "render_layer"
+    bl_context = "view_layer"
 
     def draw(self, context):
         layout = self.layout
 
         scene = context.scene
-        rl = scene.render_layers.active
+        view_layer = scene.view_layers.active
 
         col = layout.column()
-        col.prop(rl, "use_sky", "Use Environment")
-        col.prop(rl, "use_ao", "Use AO")
-        col.prop(rl, "use_solid", "Use Surfaces")
-        col.prop(rl, "use_strand", "Use Hair")
+        col.prop(view_layer, "use_sky", "Use Environment")
+        col.prop(view_layer, "use_ao", "Use AO")
+        col.prop(view_layer, "use_solid", "Use Surfaces")
+        col.prop(view_layer, "use_strand", "Use Hair")
 
 
 class CYCLES_RENDER_PT_layer_passes(CyclesButtonsPanel, Panel):
     bl_label = "Passes"
-    bl_context = "render_layer"
+    bl_context = "view_layer"
     bl_options = {'DEFAULT_CLOSED'}
 
     def draw(self, context):
@@ -457,76 +457,76 @@ class CYCLES_RENDER_PT_layer_passes(CyclesButtonsPanel, Panel):
 
         scene = context.scene
         rd = scene.render
-        rl = scene.render_layers.active
-        crl = rl.cycles
+        view_layer = scene.view_layers.active
+        cycles_view_layer = view_layer.cycles
 
         split = layout.split()
 
         col = split.column()
-        col.prop(rl, "use_pass_combined")
-        col.prop(rl, "use_pass_z")
-        col.prop(rl, "use_pass_mist")
-        col.prop(rl, "use_pass_normal")
+        col.prop(view_layer, "use_pass_combined")
+        col.prop(view_layer, "use_pass_z")
+        col.prop(view_layer, "use_pass_mist")
+        col.prop(view_layer, "use_pass_normal")
         row = col.row()
-        row.prop(rl, "use_pass_vector")
+        row.prop(view_layer, "use_pass_vector")
         row.active = not rd.use_motion_blur
-        col.prop(rl, "use_pass_uv")
-        col.prop(rl, "use_pass_object_index")
-        col.prop(rl, "use_pass_material_index")
+        col.prop(view_layer, "use_pass_uv")
+        col.prop(view_layer, "use_pass_object_index")
+        col.prop(view_layer, "use_pass_material_index")
         col.separator()
-        col.prop(rl, "use_pass_shadow")
-        col.prop(rl, "use_pass_ambient_occlusion")
+        col.prop(view_layer, "use_pass_shadow")
+        col.prop(view_layer, "use_pass_ambient_occlusion")
         col.separator()
-        col.prop(rl, "pass_alpha_threshold")
+        col.prop(view_layer, "pass_alpha_threshold")
 
         col = split.column()
         col.label(text="Diffuse:")
         row = col.row(align=True)
-        row.prop(rl, "use_pass_diffuse_direct", text="Direct", toggle=True)
-        row.prop(rl, "use_pass_diffuse_indirect", text="Indirect", toggle=True)
-        row.prop(rl, "use_pass_diffuse_color", text="Color", toggle=True)
+        row.prop(view_layer, "use_pass_diffuse_direct", text="Direct", toggle=True)
+        row.prop(view_layer, "use_pass_diffuse_indirect", text="Indirect", toggle=True)
+        row.prop(view_layer, "use_pass_diffuse_color", text="Color", toggle=True)
         col.label(text="Glossy:")
         row = col.row(align=True)
-        row.prop(rl, "use_pass_glossy_direct", text="Direct", toggle=True)
-        row.prop(rl, "use_pass_glossy_indirect", text="Indirect", toggle=True)
-        row.prop(rl, "use_pass_glossy_color", text="Color", toggle=True)
+        row.prop(view_layer, "use_pass_glossy_direct", text="Direct", toggle=True)
+        row.prop(view_layer, "use_pass_glossy_indirect", text="Indirect", toggle=True)
+        row.prop(view_layer, "use_pass_glossy_color", text="Color", toggle=True)
         col.label(text="Transmission:")
         row = col.row(align=True)
-        row.prop(rl, "use_pass_transmission_direct", text="Direct", toggle=True)
-        row.prop(rl, "use_pass_transmission_indirect", text="Indirect", toggle=True)
-        row.prop(rl, "use_pass_transmission_color", text="Color", toggle=True)
+        row.prop(view_layer, "use_pass_transmission_direct", text="Direct", toggle=True)
+        row.prop(view_layer, "use_pass_transmission_indirect", text="Indirect", toggle=True)
+        row.prop(view_layer, "use_pass_transmission_color", text="Color", toggle=True)
         col.label(text="Subsurface:")
         row = col.row(align=True)
-        row.prop(rl, "use_pass_subsurface_direct", text="Direct", toggle=True)
-        row.prop(rl, "use_pass_subsurface_indirect", text="Indirect", toggle=True)
-        row.prop(rl, "use_pass_subsurface_color", text="Color", toggle=True)
+        row.prop(view_layer, "use_pass_subsurface_direct", text="Direct", toggle=True)
+        row.prop(view_layer, "use_pass_subsurface_indirect", text="Indirect", toggle=True)
+        row.prop(view_layer, "use_pass_subsurface_color", text="Color", toggle=True)
         col.label(text="Volume:")
         row = col.row(align=True)
-        row.prop(crl, "use_pass_volume_direct", text="Direct", toggle=True)
-        row.prop(crl, "use_pass_volume_indirect", text="Indirect", toggle=True)
+        row.prop(cycles_view_layer, "use_pass_volume_direct", text="Direct", toggle=True)
+        row.prop(cycles_view_layer, "use_pass_volume_indirect", text="Indirect", toggle=True)
 
         col.separator()
-        col.prop(rl, "use_pass_emit", text="Emission")
-        col.prop(rl, "use_pass_environment")
+        col.prop(view_layer, "use_pass_emit", text="Emission")
+        col.prop(view_layer, "use_pass_environment")
 
         if context.scene.cycles.feature_set == 'EXPERIMENTAL':
             col.separator()
             sub = col.column()
-            sub.active = crl.use_denoising
-            sub.prop(crl, "denoising_store_passes", text="Denoising")
+            sub.active = cycles_view_layer.use_denoising
+            sub.prop(cycles_view_layer, "denoising_store_passes", text="Denoising")
 
         col = layout.column()
-        col.prop(crl, "pass_debug_render_time")
+        col.prop(cycles_view_layer, "pass_debug_render_time")
         if _cycles.with_cycles_debug:
-            col.prop(crl, "pass_debug_bvh_traversed_nodes")
-            col.prop(crl, "pass_debug_bvh_traversed_instances")
-            col.prop(crl, "pass_debug_bvh_intersections")
-            col.prop(crl, "pass_debug_ray_bounces")
+            col.prop(cycles_view_layer, "pass_debug_bvh_traversed_nodes")
+            col.prop(cycles_view_layer, "pass_debug_bvh_traversed_instances")
+            col.prop(cycles_view_layer, "pass_debug_bvh_intersections")
+            col.prop(cycles_view_layer, "pass_debug_ray_bounces")
 
 
 class CYCLES_RENDER_PT_views(CyclesButtonsPanel, Panel):
     bl_label = "Views"
-    bl_context = "render_layer"
+    bl_context = "view_layer"
     bl_options = {'DEFAULT_CLOSED'}
 
     def draw_header(self, context):
@@ -548,7 +548,7 @@ class CYCLES_RENDER_PT_views(CyclesButtonsPanel, Panel):
 
         if basic_stereo:
             row = layout.row()
-            row.template_list("RENDERLAYER_UL_renderviews", "name", rd, "stereo_views", rd.views, "active_index", rows=2)
+            row.template_list("VIEWLAYER_UL_renderviews", "name", rd, "stereo_views", rd.views, "active_index", rows=2)
 
             row = layout.row()
             row.label(text="File Suffix:")
@@ -556,7 +556,7 @@ class CYCLES_RENDER_PT_views(CyclesButtonsPanel, Panel):
 
         else:
             row = layout.row()
-            row.template_list("RENDERLAYER_UL_renderviews", "name", rd, "views", rd.views, "active_index", rows=2)
+            row.template_list("VIEWLAYER_UL_renderviews", "name", rd, "views", rd.views, "active_index", rows=2)
 
             col = row.column(align=True)
             col.operator("scene.render_view_add", icon='ZOOMIN', text="")
@@ -569,65 +569,65 @@ class CYCLES_RENDER_PT_views(CyclesButtonsPanel, Panel):
 
 class CYCLES_RENDER_PT_denoising(CyclesButtonsPanel, Panel):
     bl_label = "Denoising"
-    bl_context = "render_layer"
+    bl_context = "view_layer"
     bl_options = {'DEFAULT_CLOSED'}
 
     def draw_header(self, context):
         scene = context.scene
-        rl = scene.

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list