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 /release | |
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 'release')
-rw-r--r-- | release/scripts/freestyle/modules/parameter_editor.py | 2 | ||||
-rw-r--r-- | release/scripts/modules/bpy_extras/object_utils.py | 4 | ||||
-rw-r--r-- | release/scripts/presets/keyconfig/3dsmax.py | 2 | ||||
-rw-r--r-- | release/scripts/presets/keyconfig/maya.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_operators/clip.py | 22 | ||||
-rw-r--r-- | release/scripts/startup/bl_operators/freestyle.py | 12 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/__init__.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_workspace.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_freestyle.py | 54 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_object.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_view_layer.py (renamed from release/scripts/startup/bl_ui/properties_render_layer.py) | 110 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_info.py | 6 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 6 |
14 files changed, 114 insertions, 114 deletions
diff --git a/release/scripts/freestyle/modules/parameter_editor.py b/release/scripts/freestyle/modules/parameter_editor.py index e5fc83b07ed..b00b30a9a21 100644 --- a/release/scripts/freestyle/modules/parameter_editor.py +++ b/release/scripts/freestyle/modules/parameter_editor.py @@ -1206,7 +1206,7 @@ integration_types = { # main function for parameter processing def process(layer_name, lineset_name): scene = getCurrentScene() - layer = scene.render_layers[layer_name] + layer = scene.view_layers[layer_name] lineset = layer.freestyle_settings.linesets[lineset_name] linestyle = lineset.linestyle diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py index 8f2e69313fc..eb0123f12eb 100644 --- a/release/scripts/modules/bpy_extras/object_utils.py +++ b/release/scripts/modules/bpy_extras/object_utils.py @@ -120,14 +120,14 @@ def object_data_add(context, obdata, operator=None, name=None): :rtype: :class:`bpy.types.Object` """ scene = context.scene - layer = context.render_layer + layer = context.view_layer layer_collection = context.layer_collection for ob in layer.objects: ob.select_set(action='DESELECT') if not layer_collection: - # when there is no collection linked to this render_layer create one + # when there is no collection linked to this view_layer create one scene_collection = scene.master_collection.collections.new("") layer_collection = layer.collections.link(scene_collection) else: diff --git a/release/scripts/presets/keyconfig/3dsmax.py b/release/scripts/presets/keyconfig/3dsmax.py index 09c6704df1f..a4288377b82 100644 --- a/release/scripts/presets/keyconfig/3dsmax.py +++ b/release/scripts/presets/keyconfig/3dsmax.py @@ -1109,7 +1109,7 @@ kmi = km.keymap_items.new('node.group_edit', 'TAB', 'PRESS') kmi.properties.exit = False kmi = km.keymap_items.new('node.group_edit', 'TAB', 'PRESS', shift=True) kmi.properties.exit = True -kmi = km.keymap_items.new('node.read_renderlayers', 'R', 'PRESS', ctrl=True) +kmi = km.keymap_items.new('node.read_viewlayers', 'R', 'PRESS', ctrl=True) kmi = km.keymap_items.new('node.read_fullsamplelayers', 'R', 'PRESS', shift=True) kmi = km.keymap_items.new('node.render_changed', 'Z', 'PRESS') kmi = km.keymap_items.new('node.clipboard_copy', 'C', 'PRESS', ctrl=True) diff --git a/release/scripts/presets/keyconfig/maya.py b/release/scripts/presets/keyconfig/maya.py index 194b9b3c283..3075e0bd009 100644 --- a/release/scripts/presets/keyconfig/maya.py +++ b/release/scripts/presets/keyconfig/maya.py @@ -1499,7 +1499,7 @@ kmi.properties.prev = False kmi = km.keymap_items.new('node.group_make', 'G', 'PRESS', ctrl=True) kmi = km.keymap_items.new('node.group_ungroup', 'G', 'PRESS', alt=True) kmi = km.keymap_items.new('node.group_edit', 'TAB', 'PRESS') -kmi = km.keymap_items.new('node.read_renderlayers', 'R', 'PRESS', ctrl=True) +kmi = km.keymap_items.new('node.read_viewlayers', 'R', 'PRESS', ctrl=True) kmi = km.keymap_items.new('node.read_fullsamplelayers', 'R', 'PRESS', shift=True) kmi = km.keymap_items.new('node.render_changed', 'Z', 'PRESS') kmi = km.keymap_items.new('node.translate_attach', 'W', 'PRESS') diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py index f39dc1a8b08..467512a9746 100644 --- a/release/scripts/startup/bl_operators/clip.py +++ b/release/scripts/startup/bl_operators/clip.py @@ -611,24 +611,24 @@ class CLIP_OT_setup_tracking_scene(Operator): CLIP_set_viewport_background(context, True, sc.clip, sc.clip_user) @staticmethod - def _setupRenderLayers(context): + def _setupViewLayers(context): scene = context.scene - rlayers = scene.render_layers + view_layers = scene.view_layers - if not scene.render_layers.get("Foreground"): - if len(rlayers) == 1: - fg = rlayers[0] + if not view_layers.get("Foreground"): + if len(view_layers) == 1: + fg = view_layers[0] fg.name = 'Foreground' else: - fg = scene.render_layers.new("Foreground") + fg = view_layers.new("Foreground") fg.use_sky = True fg.layers = [True] + [False] * 19 fg.layers_zmask = [False] * 10 + [True] + [False] * 9 fg.use_pass_vector = True - if not scene.render_layers.get("Background"): - bg = scene.render_layers.new("Background") + if not view_layers.get("Background"): + bg = view_layers.new("Background") bg.use_pass_shadow = True bg.use_pass_ambient_occlusion = True bg.layers = [False] * 10 + [True] + [False] * 9 @@ -940,8 +940,8 @@ class CLIP_OT_setup_tracking_scene(Operator): def _setupObjects(self, context): scene = context.scene - fg = scene.render_layers.get("Foreground") - bg = scene.render_layers.get("Background") + fg = scene.view_layers.get("Foreground") + bg = scene.view_layers.get("Background") all_layers = self._mergeLayers(fg.layers, bg.layers) @@ -985,7 +985,7 @@ class CLIP_OT_setup_tracking_scene(Operator): self._setupWorld(context) self._setupCamera(context) self._setupViewport(context) - self._setupRenderLayers(context) + self._setupViewLayers(context) self._setupNodes(context) self._setupObjects(context) diff --git a/release/scripts/startup/bl_operators/freestyle.py b/release/scripts/startup/bl_operators/freestyle.py index d13b427e28d..6d862da0ba9 100644 --- a/release/scripts/startup/bl_operators/freestyle.py +++ b/release/scripts/startup/bl_operators/freestyle.py @@ -47,15 +47,15 @@ class SCENE_OT_freestyle_fill_range_by_selection(bpy.types.Operator): @classmethod def poll(cls, context): - rl = context.scene.render_layers.active - return rl and rl.freestyle_settings.linesets.active + view_layer = context.scene.view_layers.active + return view_layer and view_layer.freestyle_settings.linesets.active def execute(self, context): import sys scene = context.scene - rl = scene.render_layers.active - lineset = rl.freestyle_settings.linesets.active + view_layer = scene.view_layers.active + lineset = view_layer.freestyle_settings.linesets.active linestyle = lineset.linestyle # Find the modifier to work on if self.type == 'COLOR': @@ -207,8 +207,8 @@ class SCENE_OT_freestyle_module_open(bpy.types.Operator): @classmethod def poll(cls, context): - rl = context.scene.render_layers.active - return rl and rl.freestyle_settings.mode == 'SCRIPT' + view_layer = context.scene.view_layers.active + return view_layer and view_layer.freestyle_settings.mode == 'SCRIPT' def invoke(self, context, event): self.freestyle_module = context.freestyle_module diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py index 037fe9618ec..deeed2d1c05 100644 --- a/release/scripts/startup/bl_ui/__init__.py +++ b/release/scripts/startup/bl_ui/__init__.py @@ -60,7 +60,7 @@ _modules = [ "properties_physics_smoke", "properties_physics_softbody", "properties_render", - "properties_render_layer", + "properties_view_layer", "properties_scene", "properties_texture", "properties_world", diff --git a/release/scripts/startup/bl_ui/properties_data_workspace.py b/release/scripts/startup/bl_ui/properties_data_workspace.py index 42a5406d1c8..1595e6895d1 100644 --- a/release/scripts/startup/bl_ui/properties_data_workspace.py +++ b/release/scripts/startup/bl_ui/properties_data_workspace.py @@ -54,7 +54,7 @@ class WORKSPACE_PT_workspace(WorkSpaceButtonsPanel, Panel): layout.enabled = not workspace.use_scene_settings - layout.template_search(workspace, "render_layer", scene, "render_layers") + layout.template_search(workspace, "view_layer", scene, "view_layers") if view_render.has_multiple_engines: layout.prop(view_render, "engine", text="") diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index 5d1d6d3dbac..d9f28040b16 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -62,10 +62,10 @@ class RENDER_PT_freestyle(RenderFreestyleButtonsPanel, Panel): # Render layer properties -class RenderLayerFreestyleButtonsPanel: +class ViewLayerFreestyleButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' - bl_context = "render_layer" + bl_context = "view_layer" # COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here @classmethod @@ -75,21 +75,21 @@ class RenderLayerFreestyleButtonsPanel: with_freestyle = bpy.app.build_options.freestyle return (scene and with_freestyle and rd.use_freestyle and - scene.render_layers.active and(scene.view_render.engine in cls.COMPAT_ENGINES)) + scene.view_layers.active and(scene.view_render.engine in cls.COMPAT_ENGINES)) -class RenderLayerFreestyleEditorButtonsPanel(RenderLayerFreestyleButtonsPanel): +class ViewLayerFreestyleEditorButtonsPanel(ViewLayerFreestyleButtonsPanel): # COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here @classmethod def poll(cls, context): if not super().poll(context): return False - rl = context.scene.render_layers.active - return rl and rl.freestyle_settings.mode == 'EDITOR' + view_layer = context.scene.view_layers.active + return view_layer and view_layer.freestyle_settings.mode == 'EDITOR' -class RENDERLAYER_UL_linesets(UIList): +class VIEWLAYER_UL_linesets(UIList): def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index): lineset = item if self.layout_type in {'DEFAULT', 'COMPACT'}: @@ -109,7 +109,7 @@ class RENDER_MT_lineset_specials(Menu): layout.operator("scene.freestyle_lineset_paste", icon='PASTEDOWN') -class RENDERLAYER_PT_freestyle(RenderLayerFreestyleButtonsPanel, Panel): +class VIEWLAYER_PT_freestyle(ViewLayerFreestyleButtonsPanel, Panel): bl_label = "Freestyle" COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -117,10 +117,10 @@ class RENDERLAYER_PT_freestyle(RenderLayerFreestyleButtonsPanel, Panel): layout = self.layout scene = context.scene - rl = scene.render_layers.active - freestyle = rl.freestyle_settings + view_layer = scene.view_layers.active + freestyle = view_layer.freestyle_settings - layout.active = rl.use_freestyle + layout.active = view_layer.use_freestyle row = layout.row() layout.prop(freestyle, "mode", text="Control Mode") @@ -165,7 +165,7 @@ class RENDERLAYER_PT_freestyle(RenderLayerFreestyleButtonsPanel, Panel): row.operator("scene.freestyle_module_move", icon='TRIA_DOWN', text="").direction = 'DOWN' -class RENDERLAYER_PT_freestyle_lineset(RenderLayerFreestyleEditorButtonsPanel, Panel): +class VIEWLAYER_PT_freestyle_lineset(ViewLayerFreestyleEditorButtonsPanel, Panel): bl_label = "Freestyle Line Set" COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -187,15 +187,15 @@ class RENDERLAYER_PT_freestyle_lineset(RenderLayerFreestyleEditorButtonsPanel, P rd = scene.render view_render = scene.view_render - rl = scene.render_layers.active - freestyle = rl.freestyle_settings + view_layer = scene.view_layers.active + freestyle = view_layer.freestyle_settings lineset = freestyle.linesets.active - layout.active = rl.use_freestyle + layout.active = view_layer.use_freestyle row = layout.row() rows = 4 if lineset else 2 - row.template_list("RENDERLAYER_UL_linesets", "", freestyle, "linesets", freestyle.linesets, "active_index", rows=rows) + row.template_list("VIEWLAYER_UL_linesets", "", freestyle, "linesets", freestyle.linesets, "active_index", rows=rows) sub = row.column(align=True) sub.operator("scene.freestyle_lineset_add", icon='ZOOMIN', text="") @@ -259,7 +259,7 @@ class RENDERLAYER_PT_freestyle_lineset(RenderLayerFreestyleEditorButtonsPanel, P row.prop(lineset, "group_negation", expand=True) -class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, Panel): +class VIEWLAYER_PT_freestyle_linestyle(ViewLayerFreestyleEditorButtonsPanel, Panel): bl_label = "Freestyle Line Style" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -379,7 +379,7 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, row = box.row(align=True) row.prop(modifier, "curvature_min") row.prop(modifier, "curvature_max") - freestyle = context.scene.render_layers.active.freestyle_settings + freestyle = context.scene.view_layers.active.freestyle_settings if not freestyle.use_smoothness: message = "Enable Face Smoothness to use this modifier" self.draw_modifier_box_error(col.box(), modifier, message) @@ -434,7 +434,7 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, row = box.row(align=True) row.prop(modifier, "curvature_min") row.prop(modifier, "curvature_max") - freestyle = context.scene.render_layers.active.freestyle_settings + freestyle = context.scene.view_layers.active.freestyle_settings if not freestyle.use_smoothness: message = "Enable Face Smoothness to use this modifier" self.draw_modifier_box_error(col.box(), modifier, message) @@ -506,7 +506,7 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, row = box.row(align=True) row.prop(modifier, "curvature_min") row.prop(modifier, "curvature_max") - freestyle = context.scene.render_layers.active.freestyle_settings + freestyle = context.scene.view_layers.active.freestyle_settings if not freestyle.use_smoothness: message = "Enable Face Smoothness to use this modifier" self.draw_modifier_box_error(col.box(), modifier, message) @@ -615,10 +615,10 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, layout = self.layout scene = context.scene - rl = scene.render_layers.active - lineset = rl.freestyle_settings.linesets.active + view_layer = scene.view_layers.active + lineset = view_layer.freestyle_settings.linesets.active - layout.active = rl.use_freestyle + layout.active = view_layer.use_freestyle if lineset is None: return @@ -833,11 +833,11 @@ class MATERIAL_PT_freestyle_line(MaterialFreestyleButtonsPanel, Panel): classes = ( RENDER_PT_freestyle, - RENDERLAYER_UL_linesets, + VIEWLAYER_UL_linesets, RENDER_MT_lineset_specials, - RENDERLAYER_PT_freestyle, - RENDERLAYER_PT_freestyle_lineset, - RENDERLAYER_PT_freestyle_linestyle, + VIEWLAYER_PT_freestyle, + VIEWLAYER_PT_freestyle_lineset, + VIEWLAYER_PT_freestyle_linestyle, MATERIAL_PT_freestyle_line, ) diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index d25a85d5b4c..49ecb94248e 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -40,7 +40,7 @@ class OBJECT_PT_context_object(ObjectButtonsPanel, Panel): layout.template_ID(space, "pin_id") else: row = layout.row() - row.template_ID(context.render_layer.objects, "active") + row.template_ID(context.view_layer.objects, "active") class OBJECT_PT_transform(ObjectButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py b/release/scripts/startup/bl_ui/properties_view_layer.py index 1a2ed307c6d..b1c76a79fcd 100644 --- a/release/scripts/startup/bl_ui/properties_render_layer.py +++ b/release/scripts/startup/bl_ui/properties_view_layer.py @@ -21,10 +21,10 @@ import bpy from bpy.types import Panel, UIList -class RenderLayerButtonsPanel: +class ViewLayerButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' - bl_context = "render_layer" + bl_context = "view_layer" # COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here @classmethod @@ -33,7 +33,7 @@ class RenderLayerButtonsPanel: return scene and (scene.view_render.engine in cls.COMPAT_ENGINES) -class RENDERLAYER_UL_renderlayers(UIList): +class VIEWLAYER_UL_viewlayers(UIList): def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index): # assert(isinstance(item, bpy.types.SceneLayer) layer = item @@ -45,7 +45,7 @@ class RENDERLAYER_UL_renderlayers(UIList): layout.label("", icon_value=icon) -class RENDERLAYER_PT_layers(RenderLayerButtonsPanel, Panel): +class VIEWLAYER_PT_layers(ViewLayerButtonsPanel, Panel): bl_label = "Layer List" bl_options = {'HIDE_HEADER'} COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME', 'BLENDER_CLAY', 'BLENDER_EEVEE'} @@ -63,16 +63,16 @@ class RENDERLAYER_PT_layers(RenderLayerButtonsPanel, Panel): row = layout.row() col = row.column() - col.template_list("RENDERLAYER_UL_renderlayers", "", scene, "render_layers", scene.render_layers, "active_index", rows=2) + col.template_list("VIEWLAYER_UL_viewlayers", "", scene, "view_layers", scene.view_layers, "active_index", rows=2) col = row.column() sub = col.column(align=True) - sub.operator("scene.render_layer_add", icon='ZOOMIN', text="") - sub.operator("scene.render_layer_remove", icon='ZOOMOUT', text="") + sub.operator("scene.view_layer_add", icon='ZOOMIN', text="") + sub.operator("scene.view_layer_remove", icon='ZOOMOUT', text="") col.prop(rd, "use_single_layer", icon_only=True) -class RENDERLAYER_UL_renderviews(UIList): +class VIEWLAYER_UL_renderviews(UIList): def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index): # assert(isinstance(item, bpy.types.SceneRenderView) view = item @@ -88,7 +88,7 @@ class RENDERLAYER_UL_renderviews(UIList): layout.label("", icon_value=icon + (not view.use)) -class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel): +class VIEWLAYER_PT_views(ViewLayerButtonsPanel, Panel): bl_label = "Views" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'} bl_options = {'DEFAULT_CLOSED'} @@ -112,7 +112,7 @@ class RENDERLAYER_PT_views(RenderLayerButtonsPanel, 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:") @@ -120,7 +120,7 @@ class RENDERLAYER_PT_views(RenderLayerButtonsPanel, 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="") @@ -131,7 +131,7 @@ class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel): row.prop(rv, "camera_suffix", text="") -class RENDERLAYER_PT_clay_settings(RenderLayerButtonsPanel, Panel): +class VIEWLAYER_PT_clay_settings(ViewLayerButtonsPanel, Panel): bl_label = "Render Settings" COMPAT_ENGINES = {'BLENDER_CLAY'} @@ -144,14 +144,14 @@ class RENDERLAYER_PT_clay_settings(RenderLayerButtonsPanel, Panel): layout = self.layout scene = context.scene scene_props = scene.layer_properties['BLENDER_CLAY'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_CLAY'] col = layout.column() col.template_override_property(layer_props, scene_props, "ssao_samples") -class RENDERLAYER_PT_eevee_ambient_occlusion(RenderLayerButtonsPanel, Panel): +class VIEWLAYER_PT_eevee_ambient_occlusion(ViewLayerButtonsPanel, Panel): bl_label = "Ambient Occlusion" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_EEVEE'} @@ -164,7 +164,7 @@ class RENDERLAYER_PT_eevee_ambient_occlusion(RenderLayerButtonsPanel, Panel): def draw_header(self, context): scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] self.layout.template_override_property(layer_props, scene_props, "gtao_enable", text="") @@ -173,7 +173,7 @@ class RENDERLAYER_PT_eevee_ambient_occlusion(RenderLayerButtonsPanel, Panel): layout = self.layout scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] col = layout.column() @@ -186,7 +186,7 @@ class RENDERLAYER_PT_eevee_ambient_occlusion(RenderLayerButtonsPanel, Panel): col.template_override_property(layer_props, scene_props, "gtao_quality") -class RENDERLAYER_PT_eevee_motion_blur(RenderLayerButtonsPanel, Panel): +class VIEWLAYER_PT_eevee_motion_blur(ViewLayerButtonsPanel, Panel): bl_label = "Motion Blur" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_EEVEE'} @@ -199,7 +199,7 @@ class RENDERLAYER_PT_eevee_motion_blur(RenderLayerButtonsPanel, Panel): def draw_header(self, context): scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] self.layout.template_override_property(layer_props, scene_props, "motion_blur_enable", text="") @@ -208,7 +208,7 @@ class RENDERLAYER_PT_eevee_motion_blur(RenderLayerButtonsPanel, Panel): layout = self.layout scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] col = layout.column() @@ -216,7 +216,7 @@ class RENDERLAYER_PT_eevee_motion_blur(RenderLayerButtonsPanel, Panel): col.template_override_property(layer_props, scene_props, "motion_blur_shutter") -class RENDERLAYER_PT_eevee_depth_of_field(RenderLayerButtonsPanel, Panel): +class VIEWLAYER_PT_eevee_depth_of_field(ViewLayerButtonsPanel, Panel): bl_label = "Depth Of Field" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_EEVEE'} @@ -229,7 +229,7 @@ class RENDERLAYER_PT_eevee_depth_of_field(RenderLayerButtonsPanel, Panel): def draw_header(self, context): scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] self.layout.template_override_property(layer_props, scene_props, "dof_enable", text="") @@ -238,7 +238,7 @@ class RENDERLAYER_PT_eevee_depth_of_field(RenderLayerButtonsPanel, Panel): layout = self.layout scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] col = layout.column() @@ -246,7 +246,7 @@ class RENDERLAYER_PT_eevee_depth_of_field(RenderLayerButtonsPanel, Panel): col.template_override_property(layer_props, scene_props, "bokeh_threshold") -class RENDERLAYER_PT_eevee_bloom(RenderLayerButtonsPanel, Panel): +class VIEWLAYER_PT_eevee_bloom(ViewLayerButtonsPanel, Panel): bl_label = "Bloom" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_EEVEE'} @@ -259,7 +259,7 @@ class RENDERLAYER_PT_eevee_bloom(RenderLayerButtonsPanel, Panel): def draw_header(self, context): scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] self.layout.template_override_property(layer_props, scene_props, "bloom_enable", text="") @@ -268,7 +268,7 @@ class RENDERLAYER_PT_eevee_bloom(RenderLayerButtonsPanel, Panel): layout = self.layout scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] col = layout.column() @@ -280,7 +280,7 @@ class RENDERLAYER_PT_eevee_bloom(RenderLayerButtonsPanel, Panel): col.template_override_property(layer_props, scene_props, "bloom_clamp") -class RENDERLAYER_PT_eevee_volumetric(RenderLayerButtonsPanel, Panel): +class VIEWLAYER_PT_eevee_volumetric(ViewLayerButtonsPanel, Panel): bl_label = "Volumetric" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_EEVEE'} @@ -293,7 +293,7 @@ class RENDERLAYER_PT_eevee_volumetric(RenderLayerButtonsPanel, Panel): def draw_header(self, context): scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] self.layout.template_override_property(layer_props, scene_props, "volumetric_enable", text="") @@ -302,7 +302,7 @@ class RENDERLAYER_PT_eevee_volumetric(RenderLayerButtonsPanel, Panel): layout = self.layout scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] col = layout.column() @@ -318,7 +318,7 @@ class RENDERLAYER_PT_eevee_volumetric(RenderLayerButtonsPanel, Panel): col.template_override_property(layer_props, scene_props, "volumetric_colored_transmittance") -class RENDERLAYER_PT_eevee_subsurface_scattering(RenderLayerButtonsPanel, Panel): +class VIEWLAYER_PT_eevee_subsurface_scattering(ViewLayerButtonsPanel, Panel): bl_label = "Subsurface Scattering" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_EEVEE'} @@ -331,7 +331,7 @@ class RENDERLAYER_PT_eevee_subsurface_scattering(RenderLayerButtonsPanel, Panel) def draw_header(self, context): scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] self.layout.template_override_property(layer_props, scene_props, "sss_enable", text="") @@ -340,7 +340,7 @@ class RENDERLAYER_PT_eevee_subsurface_scattering(RenderLayerButtonsPanel, Panel) layout = self.layout scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] col = layout.column() @@ -348,7 +348,7 @@ class RENDERLAYER_PT_eevee_subsurface_scattering(RenderLayerButtonsPanel, Panel) col.template_override_property(layer_props, scene_props, "sss_jitter_threshold") -class RENDERLAYER_PT_eevee_screen_space_reflections(RenderLayerButtonsPanel, Panel): +class VIEWLAYER_PT_eevee_screen_space_reflections(ViewLayerButtonsPanel, Panel): bl_label = "Screen Space Reflections" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_EEVEE'} @@ -361,7 +361,7 @@ class RENDERLAYER_PT_eevee_screen_space_reflections(RenderLayerButtonsPanel, Pan def draw_header(self, context): scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] self.layout.template_override_property(layer_props, scene_props, "ssr_enable", text="") @@ -370,7 +370,7 @@ class RENDERLAYER_PT_eevee_screen_space_reflections(RenderLayerButtonsPanel, Pan layout = self.layout scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] col = layout.column() @@ -384,7 +384,7 @@ class RENDERLAYER_PT_eevee_screen_space_reflections(RenderLayerButtonsPanel, Pan col.template_override_property(layer_props, scene_props, "ssr_firefly_fac") -class RENDERLAYER_PT_eevee_shadows(RenderLayerButtonsPanel, Panel): +class VIEWLAYER_PT_eevee_shadows(ViewLayerButtonsPanel, Panel): bl_label = "Shadows" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_EEVEE'} @@ -398,7 +398,7 @@ class RENDERLAYER_PT_eevee_shadows(RenderLayerButtonsPanel, Panel): layout = self.layout scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] col = layout.column() @@ -407,7 +407,7 @@ class RENDERLAYER_PT_eevee_shadows(RenderLayerButtonsPanel, Panel): col.template_override_property(layer_props, scene_props, "shadow_high_bitdepth") -class RENDERLAYER_PT_eevee_sampling(RenderLayerButtonsPanel, Panel): +class VIEWLAYER_PT_eevee_sampling(ViewLayerButtonsPanel, Panel): bl_label = "Sampling" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_EEVEE'} @@ -421,14 +421,14 @@ class RENDERLAYER_PT_eevee_sampling(RenderLayerButtonsPanel, Panel): layout = self.layout scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] col = layout.column() col.template_override_property(layer_props, scene_props, "taa_samples") -class RENDERLAYER_PT_eevee_indirect_lighting(RenderLayerButtonsPanel, Panel): +class VIEWLAYER_PT_eevee_indirect_lighting(ViewLayerButtonsPanel, Panel): bl_label = "Indirect Lighting" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_EEVEE'} @@ -442,7 +442,7 @@ class RENDERLAYER_PT_eevee_indirect_lighting(RenderLayerButtonsPanel, Panel): layout = self.layout scene = context.scene scene_props = scene.layer_properties['BLENDER_EEVEE'] - layer = bpy.context.render_layer + layer = bpy.context.view_layer layer_props = layer.engine_overrides['BLENDER_EEVEE'] col = layout.column() @@ -450,21 +450,21 @@ class RENDERLAYER_PT_eevee_indirect_lighting(RenderLayerButtonsPanel, Panel): classes = ( - RENDERLAYER_UL_renderlayers, - RENDERLAYER_PT_layers, - RENDERLAYER_UL_renderviews, - RENDERLAYER_PT_views, - RENDERLAYER_PT_clay_settings, - RENDERLAYER_PT_eevee_sampling, - RENDERLAYER_PT_eevee_shadows, - RENDERLAYER_PT_eevee_indirect_lighting, - RENDERLAYER_PT_eevee_subsurface_scattering, - RENDERLAYER_PT_eevee_screen_space_reflections, - RENDERLAYER_PT_eevee_ambient_occlusion, - RENDERLAYER_PT_eevee_volumetric, - RENDERLAYER_PT_eevee_motion_blur, - RENDERLAYER_PT_eevee_depth_of_field, - RENDERLAYER_PT_eevee_bloom, + VIEWLAYER_UL_viewlayers, + VIEWLAYER_PT_layers, + VIEWLAYER_UL_renderviews, + VIEWLAYER_PT_views, + VIEWLAYER_PT_clay_settings, + VIEWLAYER_PT_eevee_sampling, + VIEWLAYER_PT_eevee_shadows, + VIEWLAYER_PT_eevee_indirect_lighting, + VIEWLAYER_PT_eevee_subsurface_scattering, + VIEWLAYER_PT_eevee_screen_space_reflections, + VIEWLAYER_PT_eevee_ambient_occlusion, + VIEWLAYER_PT_eevee_volumetric, + VIEWLAYER_PT_eevee_motion_blur, + VIEWLAYER_PT_eevee_depth_of_field, + VIEWLAYER_PT_eevee_bloom, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 24d3ed5a0bf..dfc164592b7 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -194,7 +194,7 @@ class IMAGE_MT_image(Menu): show_render = sima.show_render - layout.operator("image.read_renderlayers") + layout.operator("image.read_viewlayers") layout.operator("image.save_dirty", text="Save All Images") diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py index aa999e72f7d..8c7fcb29ad2 100644 --- a/release/scripts/startup/bl_ui/space_info.py +++ b/release/scripts/startup/bl_ui/space_info.py @@ -31,7 +31,7 @@ class INFO_HT_header(Header): workspace = context.workspace screen = context.screen scene = context.scene - layer = context.render_layer + layer = context.view_layer view_render = workspace.view_render row = layout.row(align=True) @@ -56,7 +56,7 @@ class INFO_HT_header(Header): row = layout.row() row.active = not workspace.use_scene_settings - row.template_search(workspace, "render_layer", scene, "render_layers") + row.template_search(workspace, "view_layer", scene, "view_layers") if view_render.has_multiple_engines: row.prop(view_render, "engine", text="") @@ -86,7 +86,7 @@ class INFO_HT_header(Header): return row.operator("wm.splash", text="", icon='BLENDER', emboss=False) - row.label(text=scene.statistics(context.render_layer), translate=False) + row.label(text=scene.statistics(context.view_layer), translate=False) class INFO_MT_editor_menus(Menu): diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 612ac8e4c40..2f98585f538 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -81,8 +81,8 @@ class NODE_HT_header(Header): row.prop(snode_id, "use_nodes") if use_shading_nodes and snode.shader_type == 'LINESTYLE': - rl = context.scene.render_layers.active - lineset = rl.freestyle_settings.linesets.active + view_layer = context.scene.view_layers.active + lineset = view_layer.freestyle_settings.linesets.active if lineset is not None: row = layout.row() row.enabled = not snode.pin @@ -272,7 +272,7 @@ class NODE_MT_node(Menu): layout.separator() - layout.operator("node.read_renderlayers") + layout.operator("node.read_viewlayers") layout.operator("node.read_fullsamplelayers") |