diff options
421 files changed, 3116 insertions, 3059 deletions
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.render_layers.active - crl = rl.cycles + view_layer = scene.view_layers.active + cycles_view_layer = view_layer.cycles cscene = scene.cycles layout = self.layout - layout.prop(crl, "use_denoising", text="") + layout.prop(cycles_view_layer, "use_denoising", text="") def draw(self, context): layout = self.layout scene = context.scene cscene = scene.cycles - rl = scene.render_layers.active - crl = rl.cycles + view_layer = scene.view_layers.active + cycles_view_layer = view_layer.cycles - layout.active = crl.use_denoising + layout.active = cycles_view_layer.use_denoising split = layout.split() col = split.column() sub = col.column(align=True) - sub.prop(crl, "denoising_radius", text="Radius") - sub.prop(crl, "denoising_strength", slider=True, text="Strength") + sub.prop(cycles_view_layer, "denoising_radius", text="Radius") + sub.prop(cycles_view_layer, "denoising_strength", slider=True, text="Strength") col = split.column() sub = col.column(align=True) - sub.prop(crl, "denoising_feature_strength", slider=True, text="Feature Strength") - sub.prop(crl, "denoising_relative_pca") + sub.prop(cycles_view_layer, "denoising_feature_strength", slider=True, text="Feature Strength") + sub.prop(cycles_view_layer, "denoising_relative_pca") layout.separator() row = layout.row() row.label(text="Diffuse:") sub = row.row(align=True) - sub.prop(crl, "denoising_diffuse_direct", text="Direct", toggle=True) - sub.prop(crl, "denoising_diffuse_indirect", text="Indirect", toggle=True) + sub.prop(cycles_view_layer, "denoising_diffuse_direct", text="Direct", toggle=True) + sub.prop(cycles_view_layer, "denoising_diffuse_indirect", text="Indirect", toggle=True) row = layout.row() row.label(text="Glossy:") sub = row.row(align=True) - sub.prop(crl, "denoising_glossy_direct", text="Direct", toggle=True) - sub.prop(crl, "denoising_glossy_indirect", text="Indirect", toggle=True) + sub.prop(cycles_view_layer, "denoising_glossy_direct", text="Direct", toggle=True) + sub.prop(cycles_view_layer, "denoising_glossy_indirect", text="Indirect", toggle=True) row = layout.row() row.label(text="Transmission:") sub = row.row(align=True) - sub.prop(crl, "denoising_transmission_direct", text="Direct", toggle=True) - sub.prop(crl, "denoising_transmission_indirect", text="Indirect", toggle=True) + sub.prop(cycles_view_layer, "denoising_transmission_direct", text="Direct", toggle=True) + sub.prop(cycles_view_layer, "denoising_transmission_indirect", text="Indirect", toggle=True) row = layout.row() row.label(text="Subsurface:") sub = row.row(align=True) - sub.prop(crl, "denoising_subsurface_direct", text="Direct", toggle=True) - sub.prop(crl, "denoising_subsurface_indirect", text="Indirect", toggle=True) + sub.prop(cycles_view_layer, "denoising_subsurface_direct", text="Direct", toggle=True) + sub.prop(cycles_view_layer, "denoising_subsurface_indirect", text="Indirect", toggle=True) class CYCLES_PT_post_processing(CyclesButtonsPanel, Panel): @@ -1090,8 +1090,8 @@ class CYCLES_WORLD_PT_mist(CyclesButtonsPanel, Panel): def poll(cls, context): if CyclesButtonsPanel.poll(context): if context.world: - for rl in context.scene.render_layers: - if rl.use_pass_mist: + for view_layer in context.scene.view_layers: + if view_layer.use_pass_mist: return True return False @@ -1729,9 +1729,9 @@ def get_panels(): 'MATERIAL_PT_volume_options', 'MATERIAL_PT_volume_shading', 'MATERIAL_PT_volume_transp', - 'RENDERLAYER_PT_layer_options', - 'RENDERLAYER_PT_layer_passes', - 'RENDERLAYER_PT_views', + 'VIEWLAYER_PT_layer_options', + 'VIEWLAYER_PT_layer_passes', + 'VIEWLAYER_PT_views', 'RENDER_PT_antialiasing', 'RENDER_PT_bake', 'RENDER_PT_motion_blur', diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index 63b07936426..b2c0a09e14b 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -325,7 +325,7 @@ static bool ObtainCacheParticleVcol(Mesh *mesh, return true; } -static void set_resolution(BL::Object *b_ob, BL::Scene *scene, BL::SceneLayer *sl, bool render) +static void set_resolution(BL::Object *b_ob, BL::Scene *scene, BL::ViewLayer *sl, bool render) { BL::Object::modifiers_iterator b_mod; for(b_ob->modifiers.begin(b_mod); b_mod != b_ob->modifiers.end(); ++b_mod) { @@ -912,7 +912,7 @@ void BlenderSync::sync_curves(Mesh *mesh, ParticleCurveData CData; if(!preview) - set_resolution(&b_ob, &b_scene, &b_scene_layer, true); + set_resolution(&b_ob, &b_scene, &b_view_layer, true); ObtainCacheParticleData(mesh, &b_mesh, &b_ob, &CData, !preview); @@ -1057,7 +1057,7 @@ void BlenderSync::sync_curves(Mesh *mesh, } if(!preview) - set_resolution(&b_ob, &b_scene, &b_scene_layer, false); + set_resolution(&b_ob, &b_scene, &b_view_layer, false); mesh->compute_bounds(); } diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 9e9ab030146..4622dce286f 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -980,7 +980,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object& b_ob, /* test if we can instance or if the object is modified */ BL::ID b_ob_data = b_ob.data(); BL::ID key = (BKE_object_is_modified(b_ob))? b_ob_instance: b_ob_data; - BL::Material material_override = render_layer.material_override; + BL::Material material_override = view_layer.material_override; /* find shader indices */ vector<Shader*> used_shaders; @@ -1005,10 +1005,10 @@ Mesh *BlenderSync::sync_mesh(BL::Object& b_ob, /* test if we need to sync */ int requested_geometry_flags = Mesh::GEOMETRY_NONE; - if(render_layer.use_surfaces) { + if(view_layer.use_surfaces) { requested_geometry_flags |= Mesh::GEOMETRY_TRIANGLES; } - if(render_layer.use_hair) { + if(view_layer.use_hair) { requested_geometry_flags |= Mesh::GEOMETRY_CURVES; } Mesh *mesh; @@ -1076,14 +1076,14 @@ Mesh *BlenderSync::sync_mesh(BL::Object& b_ob, BL::Mesh b_mesh = object_to_mesh(b_data, b_ob, b_scene, - b_scene_layer, + b_view_layer, true, !preview, need_undeformed, mesh->subdivision_type); if(b_mesh) { - if(render_layer.use_surfaces && !hide_tris) { + if(view_layer.use_surfaces && !hide_tris) { if(mesh->subdivision_type != Mesh::SUBDIVISION_NONE) create_subd_mesh(scene, mesh, b_ob, b_mesh, used_shaders, dicing_rate, max_subdivisions); @@ -1093,7 +1093,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object& b_ob, create_mesh_volume_attributes(scene, b_ob, mesh, b_scene.frame_current()); } - if(render_layer.use_hair && mesh->subdivision_type == Mesh::SUBDIVISION_NONE) + if(view_layer.use_hair && mesh->subdivision_type == Mesh::SUBDIVISION_NONE) sync_curves(mesh, b_mesh, b_ob, false); if(can_free_caches) { @@ -1208,7 +1208,7 @@ void BlenderSync::sync_mesh_motion(BL::Object& b_ob, b_mesh = object_to_mesh(b_data, b_ob, b_scene, - b_scene_layer, + b_view_layer, true, !preview, false, diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 986f0ccda68..d9210585044 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -288,8 +288,8 @@ Object *BlenderSync::sync_object(BL::Depsgraph::duplis_iterator& b_dupli_iter, /* light is handled separately */ if(object_is_light(b_ob)) { /* don't use lamps for excluded layers used as mask layer */ - if(!motion && !((layer_flag & render_layer.holdout_layer) && - (layer_flag & render_layer.exclude_layer))) + if(!motion && !((layer_flag & view_layer.holdout_layer) && + (layer_flag & view_layer.exclude_layer))) { sync_light(b_parent, persistent_id, @@ -314,7 +314,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph::duplis_iterator& b_dupli_iter, } /* Visibility flags for both parent and child. */ - bool use_holdout = (layer_flag & render_layer.holdout_layer) != 0; + bool use_holdout = (layer_flag & view_layer.holdout_layer) != 0; uint visibility = object_ray_visibility(b_ob) & PATH_RAY_ALL_VISIBILITY; if(b_parent.ptr.data != b_ob.ptr.data) { @@ -322,12 +322,12 @@ Object *BlenderSync::sync_object(BL::Depsgraph::duplis_iterator& b_dupli_iter, } /* Make holdout objects on excluded layer invisible for non-camera rays. */ - if(use_holdout && (layer_flag & render_layer.exclude_layer)) { + if(use_holdout && (layer_flag & view_layer.exclude_layer)) { visibility &= ~(PATH_RAY_ALL_VISIBILITY - PATH_RAY_CAMERA); } /* Hide objects not on render layer from camera rays. */ - if(!(layer_flag & render_layer.layer)) { + if(!(layer_flag & view_layer.layer)) { visibility &= ~PATH_RAY_CAMERA; } diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 9b06e11fd88..60e49161be2 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -60,7 +60,7 @@ BlenderSession::BlenderSession(BL::RenderEngine& b_engine, b_render(b_engine.render()), b_depsgraph(b_depsgraph), b_scene(b_scene), - b_scene_layer(b_engine.scene_layer()), + b_view_layer(b_engine.view_layer()), b_v3d(PointerRNA_NULL), b_rv3d(PointerRNA_NULL), python_thread_state(NULL) @@ -90,7 +90,7 @@ BlenderSession::BlenderSession(BL::RenderEngine& b_engine, b_render(b_scene.render()), b_depsgraph(b_depsgraph), b_scene(b_scene), - b_scene_layer(b_engine.scene_layer()), + b_view_layer(b_engine.view_layer()), b_v3d(b_v3d), b_rv3d(b_rv3d), width(width), @@ -165,7 +165,7 @@ void BlenderSession::create_session() else { /* for final render we will do full data sync per render layer, only * do some basic syncing here, no objects or materials for speed */ - sync->sync_render_layers(b_v3d, NULL); + sync->sync_view_layers(b_v3d, NULL); sync->sync_integrator(); sync->sync_camera(b_render, b_camera_override, width, height, ""); } @@ -222,7 +222,7 @@ void BlenderSession::reset_session(BL::BlendData& b_data_, BL::Scene& b_scene_) /* for final render we will do full data sync per render layer, only * do some basic syncing here, no objects or materials for speed */ BL::Object b_camera_override(b_engine.camera_override()); - sync->sync_render_layers(b_v3d, NULL); + sync->sync_view_layers(b_v3d, NULL); sync->sync_integrator(); sync->sync_camera(b_render, b_camera_override, width, height, ""); @@ -383,13 +383,13 @@ void BlenderSession::render() BufferParams buffer_params = BlenderSync::get_buffer_params(b_render, b_v3d, b_rv3d, scene->camera, width, height); /* render each layer */ - BL::Scene::render_layers_iterator b_layer_iter; + BL::Scene::view_layers_iterator b_layer_iter; BL::RenderResult::views_iterator b_view_iter; /* We do some special meta attributes when we only have single layer. */ - const bool is_single_layer = (b_scene.render_layers.length() == 1); + const bool is_single_layer = (b_scene.view_layers.length() == 1); - for(b_scene.render_layers.begin(b_layer_iter); b_layer_iter != b_scene.render_layers.end(); ++b_layer_iter) { + for(b_scene.view_layers.begin(b_layer_iter); b_layer_iter != b_scene.view_layers.end(); ++b_layer_iter) { b_rlay_name = b_layer_iter->name(); /* temporary render result to find needed passes and views */ @@ -1311,7 +1311,7 @@ bool BlenderSession::builtin_image_float_pixels(const string &builtin_name, BL::ShaderNodeTexPointDensity b_point_density_node(b_node); int length; int settings = background ? 1 : 0; /* 1 - render settings, 0 - vewport settings. */ - b_point_density_node.calc_point_density(b_scene, b_scene_layer, settings, &length, &pixels); + b_point_density_node.calc_point_density(b_scene, b_view_layer, settings, &length, &pixels); } } diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h index 7ae7bde1737..8694c9499b8 100644 --- a/intern/cycles/blender/blender_session.h +++ b/intern/cycles/blender/blender_session.h @@ -108,7 +108,7 @@ public: BL::RenderSettings b_render; BL::Depsgraph b_depsgraph; BL::Scene b_scene; - BL::SceneLayer b_scene_layer; + BL::ViewLayer b_view_layer; BL::SpaceView3D b_v3d; BL::RegionView3D b_rv3d; string b_rlay_name; diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 50a95777a0f..94c7aa3b248 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -235,7 +235,7 @@ static ShaderNode *add_node(Scene *scene, BL::RenderEngine& b_engine, BL::BlendData& b_data, BL::Scene& b_scene, - BL::SceneLayer b_scene_layer, + BL::ViewLayer b_view_layer, const bool background, ShaderGraph *graph, BL::ShaderNodeTree& b_ntree, @@ -832,7 +832,7 @@ static ShaderNode *add_node(Scene *scene, /* TODO(sergey): Use more proper update flag. */ if(true) { - b_point_density_node.cache_point_density(b_scene, b_scene_layer, settings); + b_point_density_node.cache_point_density(b_scene, b_view_layer, settings); scene->image_manager->tag_reload_image( point_density->filename.string(), point_density->builtin_data, @@ -850,7 +850,7 @@ static ShaderNode *add_node(Scene *scene, BL::Object b_ob(b_point_density_node.object()); if(b_ob) { float3 loc, size; - point_density_texture_space(b_scene, b_scene_layer, + point_density_texture_space(b_scene, b_view_layer, b_point_density_node, settings, loc, @@ -978,7 +978,7 @@ static void add_nodes(Scene *scene, BL::RenderEngine& b_engine, BL::BlendData& b_data, BL::Scene& b_scene, - BL::SceneLayer& b_scene_layer, + BL::ViewLayer& b_view_layer, const bool background, ShaderGraph *graph, BL::ShaderNodeTree& b_ntree, @@ -1053,7 +1053,7 @@ static void add_nodes(Scene *scene, b_engine, b_data, b_scene, - b_scene_layer, + b_view_layer, background, graph, b_group_ntree, @@ -1101,7 +1101,7 @@ static void add_nodes(Scene *scene, b_engine, b_data, b_scene, - b_scene_layer, + b_view_layer, background, graph, b_ntree, @@ -1165,7 +1165,7 @@ static void add_nodes(Scene *scene, BL::RenderEngine& b_engine, BL::BlendData& b_data, BL::Scene& b_scene, - BL::SceneLayer& b_scene_layer, + BL::ViewLayer& b_view_layer, const bool background, ShaderGraph *graph, BL::ShaderNodeTree& b_ntree) @@ -1175,7 +1175,7 @@ static void add_nodes(Scene *scene, b_engine, b_data, b_scene, - b_scene_layer, + b_view_layer, background, graph, b_ntree, @@ -1214,7 +1214,7 @@ void BlenderSync::sync_materials(bool update_all) if(b_mat->use_nodes() && b_mat->node_tree()) { BL::ShaderNodeTree b_ntree(b_mat->node_tree()); - add_nodes(scene, b_engine, b_data, b_scene, b_scene_layer, !preview, graph, b_ntree); + add_nodes(scene, b_engine, b_data, b_scene, b_view_layer, !preview, graph, b_ntree); } else { DiffuseBsdfNode *diffuse = new DiffuseBsdfNode(); @@ -1285,7 +1285,7 @@ void BlenderSync::sync_world(bool update_all) if(b_world && b_world.use_nodes() && b_world.node_tree()) { BL::ShaderNodeTree b_ntree(b_world.node_tree()); - add_nodes(scene, b_engine, b_data, b_scene, b_scene_layer, !preview, graph, b_ntree); + add_nodes(scene, b_engine, b_data, b_scene, b_view_layer, !preview, graph, b_ntree); /* volume */ PointerRNA cworld = RNA_pointer_get(&b_world.ptr, "cycles"); @@ -1344,8 +1344,8 @@ void BlenderSync::sync_world(bool update_all) else background->transparent = b_scene.render().alpha_mode() == BL::RenderSettings::alpha_mode_TRANSPARENT; - background->use_shader = render_layer.use_background_shader; - background->use_ao = background->use_ao && render_layer.use_background_ao; + background->use_shader = view_layer.use_background_shader; + background->use_ao = background->use_ao && view_layer.use_background_ao; if(background->modified(prevbackground)) background->tag_update(scene); @@ -1378,7 +1378,7 @@ void BlenderSync::sync_lamps(bool update_all) BL::ShaderNodeTree b_ntree(b_lamp->node_tree()); - add_nodes(scene, b_engine, b_data, b_scene, b_scene_layer, !preview, graph, b_ntree); + add_nodes(scene, b_engine, b_data, b_scene, b_view_layer, !preview, graph, b_ntree); } else { float strength = 1.0f; diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index d340435aa93..66509ebeef2 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -53,7 +53,7 @@ BlenderSync::BlenderSync(BL::RenderEngine& b_engine, b_data(b_data), b_depsgraph(b_depsgraph), b_scene(b_scene), - b_scene_layer(b_engine.scene_layer()), + b_view_layer(b_engine.view_layer()), shader_map(&scene->shaders), object_map(&scene->objects), mesh_map(&scene->meshes), @@ -198,7 +198,7 @@ void BlenderSync::sync_data(BL::RenderSettings& b_render, void **python_thread_state, const char *layer) { - sync_render_layers(b_v3d, layer); + sync_view_layers(b_v3d, layer); sync_integrator(); sync_film(); sync_shaders(); @@ -376,43 +376,43 @@ void BlenderSync::sync_film() /* Render Layer */ -void BlenderSync::sync_render_layers(BL::SpaceView3D& b_v3d, const char *layer) +void BlenderSync::sync_view_layers(BL::SpaceView3D& b_v3d, const char *layer) { string layername; /* 3d view */ if(b_v3d) { - layername = b_scene.render_layers.active().name(); + layername = b_scene.view_layers.active().name(); layer = layername.c_str(); } /* render layer */ - BL::Scene::render_layers_iterator b_rlay; + BL::Scene::view_layers_iterator b_rlay; bool first_layer = true; uint layer_override = get_layer(b_engine.layer_override()); - uint scene_layers = layer_override ? layer_override : get_layer(b_scene.layers()); + uint view_layers = layer_override ? layer_override : get_layer(b_scene.layers()); - for(b_scene.render_layers.begin(b_rlay); b_rlay != b_scene.render_layers.end(); ++b_rlay) { + for(b_scene.view_layers.begin(b_rlay); b_rlay != b_scene.view_layers.end(); ++b_rlay) { if((!layer && first_layer) || (layer && b_rlay->name() == layer)) { - render_layer.name = b_rlay->name(); + view_layer.name = b_rlay->name(); - render_layer.holdout_layer = 0; - render_layer.exclude_layer = 0; + view_layer.holdout_layer = 0; + view_layer.exclude_layer = 0; - render_layer.scene_layer = scene_layers & ~render_layer.exclude_layer; - render_layer.scene_layer |= render_layer.exclude_layer & render_layer.holdout_layer; + view_layer.view_layer = view_layers & ~view_layer.exclude_layer; + view_layer.view_layer |= view_layer.exclude_layer & view_layer.holdout_layer; - render_layer.layer = (1 << 20) - 1; - render_layer.layer |= render_layer.holdout_layer; + view_layer.layer = (1 << 20) - 1; + view_layer.layer |= view_layer.holdout_layer; - render_layer.material_override = PointerRNA_NULL; - render_layer.use_background_shader = b_rlay->use_sky(); - render_layer.use_background_ao = b_rlay->use_ao(); - render_layer.use_surfaces = b_rlay->use_solid(); - render_layer.use_hair = b_rlay->use_strand(); + view_layer.material_override = PointerRNA_NULL; + view_layer.use_background_shader = b_rlay->use_sky(); + view_layer.use_background_ao = b_rlay->use_ao(); + view_layer.use_surfaces = b_rlay->use_solid(); + view_layer.use_hair = b_rlay->use_strand(); - render_layer.bound_samples = false; - render_layer.samples = 0; + view_layer.bound_samples = false; + view_layer.samples = 0; } first_layer = false; @@ -526,7 +526,7 @@ int BlenderSync::get_denoising_pass(BL::RenderPass& b_pass) } array<Pass> BlenderSync::sync_render_passes(BL::RenderLayer& b_rlay, - BL::SceneLayer& b_slay, + BL::ViewLayer& b_slay, const SessionParams &session_params) { array<Pass> passes; @@ -820,8 +820,8 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine, !b_r.use_save_buffers(); if(params.progressive_refine) { - BL::Scene::render_layers_iterator b_rlay; - for(b_scene.render_layers.begin(b_rlay); b_rlay != b_scene.render_layers.end(); ++b_rlay) { + BL::Scene::view_layers_iterator b_rlay; + for(b_scene.view_layers.begin(b_rlay); b_rlay != b_scene.view_layers.end(); ++b_rlay) { PointerRNA crl = RNA_pointer_get(&b_rlay->ptr, "cycles"); if(get_boolean(crl, "use_denoising")) { params.progressive_refine = false; diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index d262adb13fe..dd415b1ea9d 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -43,7 +43,7 @@ class Mesh; class Object; class ParticleSystem; class Scene; -class SceneLayer; +class ViewLayer; class Shader; class ShaderGraph; class ShaderNode; @@ -67,9 +67,9 @@ public: int width, int height, void **python_thread_state, const char *layer = 0); - void sync_render_layers(BL::SpaceView3D& b_v3d, const char *layer); + void sync_view_layers(BL::SpaceView3D& b_v3d, const char *layer); array<Pass> sync_render_passes(BL::RenderLayer& b_rlay, - BL::SceneLayer& b_slay, + BL::ViewLayer& b_slay, const SessionParams &session_params); void sync_integrator(); void sync_camera(BL::RenderSettings& b_render, @@ -79,8 +79,8 @@ public: void sync_view(BL::SpaceView3D& b_v3d, BL::RegionView3D& b_rv3d, int width, int height); - inline int get_layer_samples() { return render_layer.samples; } - inline int get_layer_bound_samples() { return render_layer.bound_samples; } + inline int get_layer_samples() { return view_layer.samples; } + inline int get_layer_bound_samples() { return view_layer.bound_samples; } /* get parameters */ static SceneParams get_scene_params(BL::Scene& b_scene, @@ -165,7 +165,7 @@ private: BL::BlendData b_data; BL::Depsgraph b_depsgraph; BL::Scene b_scene; - BL::SceneLayer b_scene_layer; + BL::ViewLayer b_view_layer; id_map<void*, Shader> shader_map; id_map<ObjectKey, Object> object_map; @@ -187,7 +187,7 @@ private: struct RenderLayerInfo { RenderLayerInfo() - : scene_layer(0), layer(0), + : view_layer(0), layer(0), holdout_layer(0), exclude_layer(0), material_override(PointerRNA_NULL), use_background_shader(true), @@ -198,7 +198,7 @@ private: {} string name; - uint scene_layer; + uint view_layer; uint layer; /* This can be safely removed from Cycles. */ uint holdout_layer; /* This can be safely removed from Cycles. */ uint exclude_layer; /* This can be safely removed from Cycles. */ @@ -209,7 +209,7 @@ private: bool use_hair; int samples; /* This can be safely removed from Cycles. */ bool bound_samples; /* This can be safely removed from Cycles. */ - } render_layer; + } view_layer; Progress &progress; }; diff --git a/intern/cycles/blender/blender_texture.cpp b/intern/cycles/blender/blender_texture.cpp index dd08be3ddc9..3b06fb720de 100644 --- a/intern/cycles/blender/blender_texture.cpp +++ b/intern/cycles/blender/blender_texture.cpp @@ -34,7 +34,7 @@ void density_texture_space_invert(float3& loc, } /* namespace */ -void point_density_texture_space(BL::Scene& b_scene, BL::SceneLayer& b_scene_layer, +void point_density_texture_space(BL::Scene& b_scene, BL::ViewLayer& b_view_layer, BL::ShaderNodeTexPointDensity& b_point_density_node, int settings, float3& loc, @@ -48,7 +48,7 @@ void point_density_texture_space(BL::Scene& b_scene, BL::SceneLayer& b_scene_lay } float3 min, max; b_point_density_node.calc_point_density_minmax(b_scene, - b_scene_layer, + b_view_layer, settings, &min[0], &max[0]); diff --git a/intern/cycles/blender/blender_texture.h b/intern/cycles/blender/blender_texture.h index c343d5dab92..3d4b8739d49 100644 --- a/intern/cycles/blender/blender_texture.h +++ b/intern/cycles/blender/blender_texture.h @@ -22,7 +22,7 @@ CCL_NAMESPACE_BEGIN -void point_density_texture_space(BL::Scene& b_scene, BL::SceneLayer& b_scene_layer, +void point_density_texture_space(BL::Scene& b_scene, BL::ViewLayer& b_view_layer, BL::ShaderNodeTexPointDensity& b_point_density_node, const int settings, float3& loc, diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index 314bcaf23c4..a813a09f38a 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -46,7 +46,7 @@ void python_thread_state_restore(void **python_thread_state); static inline BL::Mesh object_to_mesh(BL::BlendData& data, BL::Object& object, BL::Scene& scene, - BL::SceneLayer scene_layer, + BL::ViewLayer view_layer, bool apply_modifiers, bool render, bool calc_undeformed, @@ -65,7 +65,7 @@ static inline BL::Mesh object_to_mesh(BL::BlendData& data, subsurf_mod.show_viewport(false); } - BL::Mesh me = data.meshes.new_from_object(scene, scene_layer, object, apply_modifiers, (render)? 2: 1, false, calc_undeformed); + BL::Mesh me = data.meshes.new_from_object(scene, view_layer, object, apply_modifiers, (render)? 2: 1, false, calc_undeformed); if(subdivision_type != Mesh::SUBDIVISION_NONE) { BL::Modifier subsurf_mod = object.modifiers[object.modifiers.length()-1]; @@ -307,7 +307,7 @@ static inline uint get_layer(const BL::Array<int, 20>& array) static inline uint get_layer(const BL::Array<int, 20>& array, const BL::Array<int, 8>& local_array, bool is_light = false, - uint scene_layers = (1 << 20) - 1) + uint view_layers = (1 << 20) - 1) { uint layer = 0; @@ -319,7 +319,7 @@ static inline uint get_layer(const BL::Array<int, 20>& array, /* Consider light is visible if it was visible without layer * override, which matches behavior of Blender Internal. */ - if(layer & scene_layers) { + if(layer & view_layers) { for(uint i = 0; i < 8; i++) layer |= (1 << (20+i)); } 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") diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc index 41769015761..945f82e8827 100644 --- a/source/blender/alembic/intern/abc_exporter.cc +++ b/source/blender/alembic/intern/abc_exporter.cc @@ -168,7 +168,7 @@ static bool export_object(const ExportSettings * const settings, const Base * co /* ************************************************************************** */ -AbcExporter::AbcExporter(Main *bmain, EvaluationContext *eval_ctx, Scene *scene, SceneLayer *scene_layer, +AbcExporter::AbcExporter(Main *bmain, EvaluationContext *eval_ctx, Scene *scene, ViewLayer *view_layer, Depsgraph *depsgraph, const char *filename, ExportSettings &settings) : m_bmain(bmain) @@ -178,7 +178,7 @@ AbcExporter::AbcExporter(Main *bmain, EvaluationContext *eval_ctx, Scene *scene, , m_shape_sampling_index(0) , m_eval_ctx(eval_ctx) , m_scene(scene) - , m_scene_layer(scene_layer) + , m_view_layer(view_layer) , m_depsgraph(depsgraph) , m_writer(NULL) {} @@ -364,7 +364,7 @@ void AbcExporter::operator()(Main *bmain, float &progress, bool &was_canceled) void AbcExporter::createTransformWritersHierarchy(EvaluationContext *eval_ctx) { - for (Base *base = static_cast<Base *>(m_settings.scene_layer->object_bases.first); base; base = base->next) { + for (Base *base = static_cast<Base *>(m_settings.view_layer->object_bases.first); base; base = base->next) { Object *ob = base->object; if (export_object(&m_settings, base, false)) { @@ -495,7 +495,7 @@ AbcTransformWriter * AbcExporter::createTransformWriter(EvaluationContext *eval_ void AbcExporter::createShapeWriters(EvaluationContext *eval_ctx) { - for (Base *base = static_cast<Base *>(m_settings.scene_layer->object_bases.first); base; base = base->next) { + for (Base *base = static_cast<Base *>(m_settings.view_layer->object_bases.first); base; base = base->next) { exploreObject(eval_ctx, base, NULL); } } @@ -657,5 +657,5 @@ void AbcExporter::setCurrentFrame(Main *bmain, double t) { m_scene->r.cfra = static_cast<int>(t); m_scene->r.subframe = static_cast<float>(t) - m_scene->r.cfra; - BKE_scene_graph_update_for_newframe(bmain->eval_ctx, m_depsgraph, bmain, m_scene, m_scene_layer); + BKE_scene_graph_update_for_newframe(bmain->eval_ctx, m_depsgraph, bmain, m_scene, m_view_layer); } diff --git a/source/blender/alembic/intern/abc_exporter.h b/source/blender/alembic/intern/abc_exporter.h index 7e25384ff0d..2a34ad2b25d 100644 --- a/source/blender/alembic/intern/abc_exporter.h +++ b/source/blender/alembic/intern/abc_exporter.h @@ -39,14 +39,14 @@ struct Depsgraph; struct Main; struct Object; struct Scene; -struct SceneLayer; +struct ViewLayer; struct Base; struct ExportSettings { ExportSettings(); Scene *scene; - SceneLayer *scene_layer; // Scene layer to export; all its objects will be exported, unless selected_only=true + ViewLayer *view_layer; // Scene layer to export; all its objects will be exported, unless selected_only=true Depsgraph *depsgraph; SimpleLogger logger; @@ -95,7 +95,7 @@ class AbcExporter { EvaluationContext *m_eval_ctx; Scene *m_scene; - SceneLayer *m_scene_layer; + ViewLayer *m_view_layer; Depsgraph *m_depsgraph; ArchiveWriter *m_writer; @@ -107,7 +107,7 @@ class AbcExporter { std::vector<AbcObjectWriter *> m_shapes; public: - AbcExporter(Main *bmain, EvaluationContext *eval_ctx, Scene *scene, SceneLayer *scene_layer, + AbcExporter(Main *bmain, EvaluationContext *eval_ctx, Scene *scene, ViewLayer *view_layer, Depsgraph *depsgraph, const char *filename, ExportSettings &settings); ~AbcExporter(); diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index c2fbed471b8..7003547ead2 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -232,7 +232,7 @@ static void find_iobject(const IObject &object, IObject &ret, struct ExportJobData { EvaluationContext eval_ctx; Scene *scene; - SceneLayer *scene_layer; + ViewLayer *view_layer; Depsgraph *depsgraph; Main *bmain; @@ -265,8 +265,8 @@ static void export_startjob(void *customdata, short *stop, short *do_update, flo try { Scene *scene = data->scene; - SceneLayer *scene_layer = data->scene_layer; - AbcExporter exporter(data->bmain, &data->eval_ctx, scene, scene_layer, data->depsgraph, data->filename, data->settings); + ViewLayer *view_layer = data->view_layer; + AbcExporter exporter(data->bmain, &data->eval_ctx, scene, view_layer, data->depsgraph, data->filename, data->settings); const int orig_frame = CFRA; @@ -276,7 +276,7 @@ static void export_startjob(void *customdata, short *stop, short *do_update, flo if (CFRA != orig_frame) { CFRA = orig_frame; - BKE_scene_graph_update_for_newframe(data->bmain->eval_ctx, data->depsgraph, data->bmain, scene, data->scene_layer); + BKE_scene_graph_update_for_newframe(data->bmain->eval_ctx, data->depsgraph, data->bmain, scene, data->view_layer); } data->export_ok = !data->was_canceled; @@ -318,7 +318,7 @@ bool ABC_export( CTX_data_eval_ctx(C, &job->eval_ctx); job->scene = scene; - job->scene_layer = CTX_data_scene_layer(C); + job->view_layer = CTX_data_view_layer(C); job->depsgraph = CTX_data_depsgraph(C); job->bmain = CTX_data_main(C); job->export_ok = false; @@ -347,7 +347,7 @@ bool ABC_export( * Later in the 2.8 development process this may be replaced by using * a specific collection for Alembic I/O, which can then be toggled * between "real" objects and cached Alembic files. */ - job->settings.scene_layer = CTX_data_scene_layer(C); + job->settings.view_layer = CTX_data_view_layer(C); job->settings.frame_start = params->frame_start; job->settings.frame_end = params->frame_end; @@ -634,7 +634,7 @@ enum { struct ImportJobData { Main *bmain; Scene *scene; - SceneLayer *scene_layer; + ViewLayer *view_layer; char filename[1024]; ImportSettings settings; @@ -837,16 +837,16 @@ static void import_endjob(void *user_data) /* Add object to scene. */ Base *base; LayerCollection *lc; - SceneLayer *scene_layer = data->scene_layer; + ViewLayer *view_layer = data->view_layer; - BKE_scene_layer_base_deselect_all(scene_layer); + BKE_view_layer_base_deselect_all(view_layer); - lc = BKE_layer_collection_get_active(scene_layer); + lc = BKE_layer_collection_get_active(view_layer); if (lc == NULL) { - BLI_assert(BLI_listbase_count_ex(&scene_layer->layer_collections, 1) == 0); - /* when there is no collection linked to this SceneLayer, create one */ + BLI_assert(BLI_listbase_count_ex(&view_layer->layer_collections, 1) == 0); + /* when there is no collection linked to this ViewLayer, create one */ SceneCollection *sc = BKE_collection_add(data->scene, NULL, NULL); - lc = BKE_collection_link(scene_layer, sc); + lc = BKE_collection_link(view_layer, sc); } for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) { @@ -855,8 +855,8 @@ static void import_endjob(void *user_data) BKE_collection_object_add(data->scene, lc->scene_collection, ob); - base = BKE_scene_layer_base_find(scene_layer, ob); - BKE_scene_layer_base_select(scene_layer, base); + base = BKE_view_layer_base_find(view_layer, ob); + BKE_view_layer_base_select(view_layer, base); DEG_id_tag_update_ex(data->bmain, &ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); } @@ -904,7 +904,7 @@ bool ABC_import(bContext *C, const char *filepath, float scale, bool is_sequence ImportJobData *job = new ImportJobData(); job->bmain = CTX_data_main(C); job->scene = CTX_data_scene(C); - job->scene_layer = CTX_data_scene_layer(C); + job->view_layer = CTX_data_view_layer(C); job->import_ok = false; BLI_strncpy(job->filename, filepath, 1024); diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index ae87f1097d1..8d326c6441c 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -28,7 +28,7 @@ * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ #define BLENDER_VERSION 280 -#define BLENDER_SUBVERSION 1 +#define BLENDER_SUBVERSION 2 /* Several breakages with 270, e.g. constraint deg vs rad */ #define BLENDER_MINVERSION 270 #define BLENDER_MINSUBVERSION 6 diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h index 27264100f1b..596a1cd1cc5 100644 --- a/source/blender/blenkernel/BKE_camera.h +++ b/source/blender/blenkernel/BKE_camera.h @@ -44,7 +44,7 @@ struct Object; struct RegionView3D; struct RenderData; struct Scene; -struct SceneLayer; +struct ViewLayer; struct rctf; struct View3D; struct GPUFXSettings; @@ -129,7 +129,7 @@ void BKE_camera_view_frame( float r_vec[4][3]); bool BKE_camera_view_frame_fit_to_scene( - struct Scene *scene, struct SceneLayer *sl, struct Object *camera_ob, + struct Scene *scene, struct ViewLayer *sl, struct Object *camera_ob, float r_co[3], float *r_scale); bool BKE_camera_view_frame_fit_to_coords( const struct Scene *scene, diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h index 7b071dc01a5..0bce2a6317c 100644 --- a/source/blender/blenkernel/BKE_context.h +++ b/source/blender/blenkernel/BKE_context.h @@ -50,7 +50,7 @@ struct PointerRNA; struct ReportList; struct Scene; struct SceneCollection; -struct SceneLayer; +struct ViewLayer; struct ScrArea; struct SpaceLink; struct View3D; @@ -252,7 +252,7 @@ struct Main *CTX_data_main(const bContext *C); struct Scene *CTX_data_scene(const bContext *C); struct LayerCollection *CTX_data_layer_collection(const bContext *C); struct SceneCollection *CTX_data_scene_collection(const bContext *C); -struct SceneLayer *CTX_data_scene_layer(const bContext *C); +struct ViewLayer *CTX_data_view_layer(const bContext *C); struct ViewRender *CTX_data_view_render(const bContext *C); struct RenderEngineType *CTX_data_engine(const bContext *C); struct ToolSettings *CTX_data_tool_settings(const bContext *C); diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h index cee10d2bd56..21c900a7f0d 100644 --- a/source/blender/blenkernel/BKE_dynamicpaint.h +++ b/source/blender/blenkernel/BKE_dynamicpaint.h @@ -28,7 +28,7 @@ */ struct Scene; -struct SceneLayer; +struct ViewLayer; struct EvaluationContext; /* Actual surface point */ diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index 3b1bb5175a2..4cc7dc6283f 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -51,38 +51,38 @@ struct Object; struct RenderEngine; struct Scene; struct SceneCollection; -struct SceneLayer; +struct ViewLayer; struct WorkSpace; void BKE_layer_exit(void); -struct SceneLayer *BKE_scene_layer_from_scene_get(const struct Scene *scene); -struct SceneLayer *BKE_scene_layer_from_workspace_get(const struct Scene *scene, const struct WorkSpace *workspace); -struct SceneLayer *BKE_scene_layer_add(struct Scene *scene, const char *name); +struct ViewLayer *BKE_view_layer_from_scene_get(const struct Scene *scene); +struct ViewLayer *BKE_view_layer_from_workspace_get(const struct Scene *scene, const struct WorkSpace *workspace); +struct ViewLayer *BKE_view_layer_add(struct Scene *scene, const char *name); /* DEPRECATED */ -struct SceneLayer *BKE_scene_layer_context_active_PLACEHOLDER(const struct Scene *scene); +struct ViewLayer *BKE_view_layer_context_active_PLACEHOLDER(const struct Scene *scene); -void BKE_scene_layer_free(struct SceneLayer *sl); +void BKE_view_layer_free(struct ViewLayer *sl); -void BKE_scene_layer_selected_objects_tag(struct SceneLayer *sl, const int tag); +void BKE_view_layer_selected_objects_tag(struct ViewLayer *sl, const int tag); -struct Object *BKE_scene_layer_camera_find(struct SceneLayer *sl); -struct SceneLayer *BKE_scene_layer_find_from_collection(const struct Scene *scene, struct LayerCollection *lc); -struct Base *BKE_scene_layer_base_find(struct SceneLayer *sl, struct Object *ob); -struct Base *BKE_scene_layer_base_find_by_name(struct SceneLayer *sl, struct Object *ob); -void BKE_scene_layer_base_deselect_all(struct SceneLayer *sl); -void BKE_scene_layer_base_select(struct SceneLayer *sl, struct Base *selbase); +struct Object *BKE_view_layer_camera_find(struct ViewLayer *sl); +struct ViewLayer *BKE_view_layer_find_from_collection(const struct Scene *scene, struct LayerCollection *lc); +struct Base *BKE_view_layer_base_find(struct ViewLayer *sl, struct Object *ob); +struct Base *BKE_view_layer_base_find_by_name(struct ViewLayer *sl, struct Object *ob); +void BKE_view_layer_base_deselect_all(struct ViewLayer *sl); +void BKE_view_layer_base_select(struct ViewLayer *sl, struct Base *selbase); -void BKE_layer_collection_free(struct SceneLayer *sl, struct LayerCollection *lc); +void BKE_layer_collection_free(struct ViewLayer *sl, struct LayerCollection *lc); -struct LayerCollection *BKE_layer_collection_get_active(struct SceneLayer *sl); -struct LayerCollection *BKE_layer_collection_get_active_ensure(struct Scene *scene, struct SceneLayer *sl); +struct LayerCollection *BKE_layer_collection_get_active(struct ViewLayer *sl); +struct LayerCollection *BKE_layer_collection_get_active_ensure(struct Scene *scene, struct ViewLayer *sl); -int BKE_layer_collection_count(struct SceneLayer *sl); +int BKE_layer_collection_count(struct ViewLayer *sl); -struct LayerCollection *BKE_layer_collection_from_index(struct SceneLayer *sl, const int index); -int BKE_layer_collection_findindex(struct SceneLayer *sl, const struct LayerCollection *lc); +struct LayerCollection *BKE_layer_collection_from_index(struct ViewLayer *sl, const int index); +int BKE_layer_collection_findindex(struct ViewLayer *sl, const struct LayerCollection *lc); bool BKE_layer_collection_move_above(const struct Scene *scene, struct LayerCollection *lc_dst, struct LayerCollection *lc_src); bool BKE_layer_collection_move_below(const struct Scene *scene, struct LayerCollection *lc_dst, struct LayerCollection *lc_src); @@ -90,14 +90,14 @@ bool BKE_layer_collection_move_into(const struct Scene *scene, struct LayerColle void BKE_layer_collection_resync(const struct Scene *scene, const struct SceneCollection *sc); -struct LayerCollection *BKE_collection_link(struct SceneLayer *sl, struct SceneCollection *sc); +struct LayerCollection *BKE_collection_link(struct ViewLayer *sl, struct SceneCollection *sc); -void BKE_collection_unlink(struct SceneLayer *sl, struct LayerCollection *lc); +void BKE_collection_unlink(struct ViewLayer *sl, struct LayerCollection *lc); -void BKE_collection_enable(struct SceneLayer *sl, struct LayerCollection *lc); -void BKE_collection_disable(struct SceneLayer *sl, struct LayerCollection *lc); +void BKE_collection_enable(struct ViewLayer *sl, struct LayerCollection *lc); +void BKE_collection_disable(struct ViewLayer *sl, struct LayerCollection *lc); -bool BKE_scene_layer_has_collection(struct SceneLayer *sl, const struct SceneCollection *sc); +bool BKE_view_layer_has_collection(struct ViewLayer *sl, const struct SceneCollection *sc); bool BKE_scene_has_object(struct Scene *scene, struct Object *ob); /* syncing */ @@ -108,8 +108,8 @@ void BKE_layer_sync_object_unlink(const struct Scene *scene, struct SceneCollect /* override */ -void BKE_override_scene_layer_datablock_add(struct SceneLayer *scene_layer, int id_type, const char *data_path, const struct ID *id); -void BKE_override_scene_layer_int_add(struct SceneLayer *scene_layer, int id_type, const char *data_path, const int value); +void BKE_override_view_layer_datablock_add(struct ViewLayer *view_layer, int id_type, const char *data_path, const struct ID *id); +void BKE_override_view_layer_int_add(struct ViewLayer *view_layer, int id_type, const char *data_path, const int value); void BKE_override_layer_collection_boolean_add(struct LayerCollection *layer_collection, int id_type, const char *data_path, const bool value); @@ -125,14 +125,14 @@ void BKE_layer_collection_engine_settings_create(struct IDProperty *root); void BKE_layer_collection_engine_settings_validate_scene(struct Scene *scene); void BKE_layer_collection_engine_settings_validate_collection(struct LayerCollection *lc); -struct IDProperty *BKE_scene_layer_engine_evaluated_get(struct SceneLayer *sl, const int type, const char *engine_name); -struct IDProperty *BKE_scene_layer_engine_layer_get(struct SceneLayer *sl, const int type, const char *engine_name); -struct IDProperty *BKE_scene_layer_engine_scene_get(struct Scene *scene, const int type, const char *engine_name); -void BKE_scene_layer_engine_settings_callback_register(struct Main *bmain, const char *engine_name, EngineSettingsCB func); -void BKE_scene_layer_engine_settings_callback_free(void); -void BKE_scene_layer_engine_settings_validate_scene(struct Scene *scene); -void BKE_scene_layer_engine_settings_validate_layer(struct SceneLayer *sl); -void BKE_scene_layer_engine_settings_create(struct IDProperty *root); +struct IDProperty *BKE_view_layer_engine_evaluated_get(struct ViewLayer *sl, const int type, const char *engine_name); +struct IDProperty *BKE_view_layer_engine_layer_get(struct ViewLayer *sl, const int type, const char *engine_name); +struct IDProperty *BKE_view_layer_engine_scene_get(struct Scene *scene, const int type, const char *engine_name); +void BKE_view_layer_engine_settings_callback_register(struct Main *bmain, const char *engine_name, EngineSettingsCB func); +void BKE_view_layer_engine_settings_callback_free(void); +void BKE_view_layer_engine_settings_validate_scene(struct Scene *scene); +void BKE_view_layer_engine_settings_validate_layer(struct ViewLayer *view_layer); +void BKE_view_layer_engine_settings_create(struct IDProperty *root); void BKE_collection_engine_property_add_float(struct IDProperty *props, const char *name, float value); void BKE_collection_engine_property_add_float_array( @@ -153,12 +153,12 @@ void BKE_collection_engine_property_value_set_bool(struct IDProperty *props, con void BKE_layer_eval_layer_collection_pre(const struct EvaluationContext *eval_ctx, struct Scene *scene, - struct SceneLayer *scene_layer); + struct ViewLayer *view_layer); void BKE_layer_eval_layer_collection(const struct EvaluationContext *eval_ctx, struct LayerCollection *layer_collection, struct LayerCollection *parent_layer_collection); void BKE_layer_eval_layer_collection_post(const struct EvaluationContext *eval_ctx, - struct SceneLayer *scene_layer); + struct ViewLayer *view_layer); /* iterators */ @@ -259,7 +259,7 @@ typedef struct ObjectsRenderableIteratorData { struct Scene *scene; struct { - struct SceneLayer *scene_layer; + struct ViewLayer *view_layer; struct Base *base; struct Scene *set; } iter; diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index 76a36bdf3ff..451823aedf5 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -39,7 +39,7 @@ struct DagNode; struct EvaluationContext; struct Object; struct Scene; -struct SceneLayer; +struct ViewLayer; struct ListBase; struct bArmature; struct Main; diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 83bcad0d799..39535ffd403 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -988,7 +988,7 @@ void ntreeCompositTagRender(struct Scene *sce); int ntreeCompositTagAnimated(struct bNodeTree *ntree); void ntreeCompositTagGenerators(struct bNodeTree *ntree); void ntreeCompositUpdateRLayers(struct bNodeTree *ntree); -void ntreeCompositRegisterPass(struct bNodeTree *ntree, struct Scene *scene, struct SceneLayer *scene_layer, const char *name, int type); +void ntreeCompositRegisterPass(struct bNodeTree *ntree, struct Scene *scene, struct ViewLayer *view_layer, const char *name, int type); void ntreeCompositClearTags(struct bNodeTree *ntree); struct bNodeSocket *ntreeCompositOutputFileAddSocket(struct bNodeTree *ntree, struct bNode *node, diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 14409c77e6d..f346be296a1 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -37,7 +37,7 @@ extern "C" { struct EvaluationContext; struct Scene; -struct SceneLayer; +struct ViewLayer; struct Object; struct BoundBox; struct View3D; @@ -89,11 +89,11 @@ struct Object *BKE_object_add_only_object( int type, const char *name) ATTR_NONNULL(1) ATTR_RETURNS_NONNULL; struct Object *BKE_object_add( - struct Main *bmain, struct Scene *scene, struct SceneLayer *scene_layer, + struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer, int type, const char *name) ATTR_NONNULL(1, 2, 3) ATTR_RETURNS_NONNULL; struct Object *BKE_object_add_from( - struct Main *bmain, struct Scene *scene, struct SceneLayer *scene_layer, + struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer, int type, const char *name, struct Object *ob_src) ATTR_NONNULL(1, 2, 3, 6) ATTR_RETURNS_NONNULL; void *BKE_object_obdata_add_from_type( @@ -105,9 +105,9 @@ void BKE_object_lod_add(struct Object *ob); void BKE_object_lod_sort(struct Object *ob); bool BKE_object_lod_remove(struct Object *ob, int level); void BKE_object_lod_update(struct Object *ob, const float camera_position[3]); -bool BKE_object_lod_is_usable(struct Object *ob, struct SceneLayer *sl); -struct Object *BKE_object_lod_meshob_get(struct Object *ob, struct SceneLayer *sl); -struct Object *BKE_object_lod_matob_get(struct Object *ob, struct SceneLayer *sl); +bool BKE_object_lod_is_usable(struct Object *ob, struct ViewLayer *sl); +struct Object *BKE_object_lod_meshob_get(struct Object *ob, struct ViewLayer *sl); +struct Object *BKE_object_lod_matob_get(struct Object *ob, struct ViewLayer *sl); void BKE_object_copy_data(struct Main *bmain, struct Object *ob_dst, const struct Object *ob_src, const int flag); struct Object *BKE_object_copy(struct Main *bmain, const struct Object *ob); @@ -157,7 +157,7 @@ bool BKE_object_minmax_dupli(struct Scene *scene, struct Object *ob, float r_min void BKE_object_foreach_display_point(struct Object *ob, float obmat[4][4], void (*func_cb)(const float[3], void *), void *user_data); void BKE_scene_foreach_display_point(struct Scene *scene, - struct SceneLayer *sl, + struct ViewLayer *sl, void (*func_cb)(const float[3], void *), void *user_data); bool BKE_object_parent_loop_check(const struct Object *parent, const struct Object *ob); @@ -261,7 +261,7 @@ typedef enum eObjectSet { OB_SET_ALL /* All Objects */ } eObjectSet; -struct LinkNode *BKE_object_relational_superset(struct SceneLayer *scene_layer, eObjectSet objectSet, eObRelationTypes includeFilter); +struct LinkNode *BKE_object_relational_superset(struct ViewLayer *view_layer, eObjectSet objectSet, eObRelationTypes includeFilter); struct LinkNode *BKE_object_groups(struct Object *ob); void BKE_object_groups_clear(struct Object *object); diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index 3d8f7b7674b..9e1f0e22e8a 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -52,7 +52,7 @@ struct PaletteColor; struct PBVH; struct ReportList; struct Scene; -struct SceneLayer; +struct ViewLayer; struct Sculpt; struct StrokeCache; struct Tex; @@ -91,8 +91,8 @@ typedef enum eOverlayControlFlags { PAINT_OVERLAY_OVERRIDE_PRIMARY | \ PAINT_OVERLAY_OVERRIDE_CURSOR) -void BKE_paint_invalidate_overlay_tex(struct Scene *scene, struct SceneLayer *sl, const struct Tex *tex); -void BKE_paint_invalidate_cursor_overlay(struct Scene *scene, struct SceneLayer *sl, struct CurveMapping *curve); +void BKE_paint_invalidate_overlay_tex(struct Scene *scene, struct ViewLayer *sl, const struct Tex *tex); +void BKE_paint_invalidate_cursor_overlay(struct Scene *scene, struct ViewLayer *sl, struct CurveMapping *curve); void BKE_paint_invalidate_overlay_all(void); eOverlayControlFlags BKE_paint_get_overlay_flags(void); void BKE_paint_reset_overlay_invalid(eOverlayControlFlags flag); @@ -126,7 +126,7 @@ void BKE_paint_cavity_curve_preset(struct Paint *p, int preset); short BKE_paint_object_mode_from_paint_mode(ePaintMode mode); struct Paint *BKE_paint_get_active_from_paintmode(struct Scene *sce, ePaintMode mode); -struct Paint *BKE_paint_get_active(struct Scene *sce, struct SceneLayer *sl); +struct Paint *BKE_paint_get_active(struct Scene *sce, struct ViewLayer *sl); struct Paint *BKE_paint_get_active_from_context(const struct bContext *C); ePaintMode BKE_paintmode_get_active_from_context(const struct bContext *C); struct Brush *BKE_paint_brush(struct Paint *paint); diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 406a6b0e982..1776872f455 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -63,7 +63,7 @@ struct BVHTreeRay; struct BVHTreeRayHit; struct EdgeHash; struct EvaluationContext; -struct SceneLayer; +struct ViewLayer; #define PARTICLE_COLLISION_MAX_COLLISIONS 10 @@ -297,7 +297,7 @@ void psys_set_current_num(Object *ob, int index); struct LatticeDeformData *psys_create_lattice_deform_data(struct ParticleSimulationData *sim); -bool psys_in_edit_mode(struct SceneLayer *scene_layer, struct ParticleSystem *psys); +bool psys_in_edit_mode(struct ViewLayer *view_layer, struct ParticleSystem *psys); bool psys_check_enabled(struct Object *ob, struct ParticleSystem *psys, const bool use_render_params); bool psys_check_edited(struct ParticleSystem *psys); diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h index ab2c3e863ef..9a5a9e9e56a 100644 --- a/source/blender/blenkernel/BKE_pointcache.h +++ b/source/blender/blenkernel/BKE_pointcache.h @@ -90,7 +90,7 @@ struct ParticleKey; struct ParticleSystem; struct PointCache; struct Scene; -struct SceneLayer; +struct ViewLayer; struct SmokeModifierData; struct SoftBody; struct RigidBodyWorld; @@ -187,7 +187,7 @@ typedef struct PTCacheID { typedef struct PTCacheBaker { struct Main *main; struct Scene *scene; - struct SceneLayer *scene_layer; + struct ViewLayer *view_layer; struct Depsgraph *depsgraph; int bake; int render; @@ -322,7 +322,7 @@ struct PointCache *BKE_ptcache_copy_list(struct ListBase *ptcaches_new, const st /********************** Baking *********************/ /* Bakes cache with cache_step sized jumps in time, not accurate but very fast. */ -void BKE_ptcache_quick_cache_all(struct Main *bmain, struct Scene *scene, struct SceneLayer *scene_layer); +void BKE_ptcache_quick_cache_all(struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer); /* Bake cache or simulate to current frame with settings defined in the baker. */ void BKE_ptcache_bake(struct PTCacheBaker *baker); diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index 2b8278547a4..bb435df136d 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -45,7 +45,7 @@ struct Object; struct RenderData; struct Scene; struct SceneCollection; -struct SceneLayer; +struct ViewLayer; struct UnitSettings; struct ViewRender; struct WorkSpace; @@ -60,12 +60,12 @@ typedef enum eSceneCopyMethod { /* Use as the contents of a 'for' loop: for (SETLOOPER(...)) { ... */ #define SETLOOPER(_sce_basis, _sce_iter, _base) \ - _sce_iter = _sce_basis, _base = _setlooper_base_step(&_sce_iter, BKE_scene_layer_from_scene_get(_sce_basis), NULL); \ + _sce_iter = _sce_basis, _base = _setlooper_base_step(&_sce_iter, BKE_view_layer_from_scene_get(_sce_basis), NULL); \ _base; \ _base = _setlooper_base_step(&_sce_iter, NULL, _base) -#define SETLOOPER_SCENE_LAYER(_sce_basis, _scene_layer, _sce_iter, _base) \ - _sce_iter = _sce_basis, _base = _setlooper_base_step(&_sce_iter, _scene_layer, NULL); \ +#define SETLOOPER_VIEW_LAYER(_sce_basis, _view_layer, _sce_iter, _base) \ + _sce_iter = _sce_basis, _base = _setlooper_base_step(&_sce_iter, _view_layer, NULL); \ _base; \ _base = _setlooper_base_step(&_sce_iter, NULL, _base) @@ -74,7 +74,7 @@ typedef enum eSceneCopyMethod { _base; \ _base = _setlooper_base_step(&_sce_iter, NULL, _base) -struct Base *_setlooper_base_step(struct Scene **sce_iter, struct SceneLayer *scene_layer, struct Base *base); +struct Base *_setlooper_base_step(struct Scene **sce_iter, struct ViewLayer *view_layer, struct Base *base); void free_avicodecdata(struct AviCodecData *acd); @@ -103,7 +103,7 @@ int BKE_scene_base_iter_next( const struct EvaluationContext *eval_ctx, struct SceneBaseIter *iter, struct Scene **scene, int val, struct Base **base, struct Object **ob); -void BKE_scene_base_flag_to_objects(struct SceneLayer *scene_layer); +void BKE_scene_base_flag_to_objects(struct ViewLayer *view_layer); void BKE_scene_base_flag_from_objects(struct Scene *scene); void BKE_scene_object_base_flag_sync_from_base(struct Base *base); void BKE_scene_object_base_flag_sync_from_object(struct Base *base); @@ -140,13 +140,13 @@ void BKE_scene_graph_update_tagged(struct EvaluationContext *eval_ctx, struct Depsgraph *depsgraph, struct Main *bmain, struct Scene *scene, - struct SceneLayer *scene_layer); + struct ViewLayer *view_layer); void BKE_scene_graph_update_for_newframe(struct EvaluationContext *eval_ctx, struct Depsgraph *depsgraph, struct Main *bmain, struct Scene *scene, - struct SceneLayer *scene_layer); + struct ViewLayer *view_layer); struct SceneRenderView *BKE_scene_add_render_view(struct Scene *sce, const char *name); bool BKE_scene_remove_render_view(struct Scene *scene, struct SceneRenderView *srv); @@ -215,7 +215,7 @@ void BKE_scene_allocate_depsgraph_hash(struct Scene *scene); void BKE_scene_ensure_depsgraph_hash(struct Scene *scene); void BKE_scene_free_depsgraph_hash(struct Scene *scene); -struct Depsgraph *BKE_scene_get_depsgraph(struct Scene *scene, struct SceneLayer *scene_layer, bool allocate); +struct Depsgraph *BKE_scene_get_depsgraph(struct Scene *scene, struct ViewLayer *view_layer, bool allocate); #ifdef __cplusplus } diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index dfb6b47a4e4..191f669e24c 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -423,7 +423,7 @@ struct Sequence *BKE_sequencer_add_movie_strip(struct bContext *C, ListBase *seq /* view3d draw callback, run when not in background view */ typedef struct ImBuf *(*SequencerDrawView)( const struct EvaluationContext *eval_ctx, struct Scene *, - struct SceneLayer *sl, struct Object *, int, int, + struct ViewLayer *sl, struct Object *, int, int, unsigned int, int, bool, bool, bool, int, int, bool, const char *, struct GPUFX *, struct GPUOffScreen *, char[256]); diff --git a/source/blender/blenkernel/BKE_workspace.h b/source/blender/blenkernel/BKE_workspace.h index b48fa678531..c5351723442 100644 --- a/source/blender/blenkernel/BKE_workspace.h +++ b/source/blender/blenkernel/BKE_workspace.h @@ -103,8 +103,8 @@ enum eObjectMode BKE_workspace_object_mode_get(const struct WorkSpace *workspace void BKE_workspace_object_mode_set(struct WorkSpace *workspace, const enum eObjectMode mode) SETTER_ATTRS; #endif struct ListBase *BKE_workspace_transform_orientations_get(struct WorkSpace *workspace) GETTER_ATTRS; -struct SceneLayer *BKE_workspace_render_layer_get(const struct WorkSpace *workspace) GETTER_ATTRS; -void BKE_workspace_render_layer_set(struct WorkSpace *workspace, struct SceneLayer *layer) SETTER_ATTRS; +struct ViewLayer *BKE_workspace_view_layer_get(const struct WorkSpace *workspace) GETTER_ATTRS; +void BKE_workspace_view_layer_set(struct WorkSpace *workspace, struct ViewLayer *layer) SETTER_ATTRS; struct ListBase *BKE_workspace_layouts_get(struct WorkSpace *workspace) GETTER_ATTRS; const char *BKE_workspace_layout_name_get(const struct WorkSpaceLayout *layout) GETTER_ATTRS; diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index f5da88f57f3..60d62b0b39d 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -2707,7 +2707,7 @@ static void editbmesh_build_data( static CustomDataMask object_get_datamask(const Scene *scene, Object *ob, bool *r_need_mapping) { /* TODO(sergey): Avoid this linear list lookup. */ - SceneLayer *sl = BKE_scene_layer_context_active_PLACEHOLDER(scene); + ViewLayer *sl = BKE_view_layer_context_active_PLACEHOLDER(scene); Object *actob = sl->basact ? sl->basact->object : NULL; CustomDataMask mask = ob->customdata_mask; diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 7a0bf54f1f2..62df97c6afa 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -279,7 +279,7 @@ void animviz_get_object_motionpaths(Object *ob, ListBase *targets) /* update scene for current frame */ static void motionpaths_calc_update_scene(Main *bmain, Scene *scene, - SceneLayer *scene_layer, + ViewLayer *view_layer, struct Depsgraph *depsgraph) { /* Do all updates @@ -292,7 +292,7 @@ static void motionpaths_calc_update_scene(Main *bmain, * * TODO(sergey): Use evaluation context dedicated to motion paths. */ - BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, view_layer); } /* ........ */ @@ -369,7 +369,7 @@ static void motionpaths_calc_bake_targets(Scene *scene, ListBase *targets) /* calculate path over requested range */ for (CFRA = sfra; CFRA <= efra; CFRA++) { /* update relevant data for new frame */ - motionpaths_calc_update_scene(bmain, scene, eval_ctx->scene_layer, eval_ctx->depsgraph); + motionpaths_calc_update_scene(bmain, scene, eval_ctx->view_layer, eval_ctx->depsgraph); /* perform baking for targets */ motionpaths_calc_bake_targets(scene, targets); @@ -377,7 +377,7 @@ static void motionpaths_calc_bake_targets(Scene *scene, ListBase *targets) /* reset original environment */ CFRA = cfra; - motionpaths_calc_update_scene(bmain, scene, eval_ctx->scene_layer, eval_ctx->depsgraph); + motionpaths_calc_update_scene(bmain, scene, eval_ctx->view_layer, eval_ctx->depsgraph); /* clear recalc flags from targets */ for (mpt = targets->first; mpt; mpt = mpt->next) { diff --git a/source/blender/blenkernel/intern/blender_copybuffer.c b/source/blender/blenkernel/intern/blender_copybuffer.c index f249765e016..b0c571bf159 100644 --- a/source/blender/blenkernel/intern/blender_copybuffer.c +++ b/source/blender/blenkernel/intern/blender_copybuffer.c @@ -120,7 +120,7 @@ bool BKE_copybuffer_paste(bContext *C, const char *libname, const short flag, Re { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Main *mainl = NULL; Library *lib; BlendHandle *bh; @@ -132,7 +132,7 @@ bool BKE_copybuffer_paste(bContext *C, const char *libname, const short flag, Re return false; } - BKE_scene_layer_base_deselect_all(scene_layer); + BKE_view_layer_base_deselect_all(view_layer); /* tag everything, all untagged data can be made local * its also generally useful to know what is new @@ -145,7 +145,7 @@ bool BKE_copybuffer_paste(bContext *C, const char *libname, const short flag, Re BLO_library_link_copypaste(mainl, bh); - BLO_library_link_end(mainl, &bh, flag, scene, scene_layer); + BLO_library_link_end(mainl, &bh, flag, scene, view_layer); /* mark all library linked objects to be updated */ BKE_main_lib_objects_recalc_all(bmain); diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index f6dfb7f922c..8d61b6723c6 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -168,7 +168,7 @@ static void setup_app_data( */ wmWindow *win; bScreen *curscreen = NULL; - SceneLayer *cur_render_layer; + ViewLayer *cur_view_layer; bool track_undo_scene; /* comes from readfile.c */ @@ -181,7 +181,7 @@ static void setup_app_data( curscreen = CTX_wm_screen(C); /* but use Scene pointer from new file */ curscene = bfd->curscene; - cur_render_layer = bfd->cur_render_layer; + cur_view_layer = bfd->cur_view_layer; track_undo_scene = (mode == LOAD_UNDO && curscreen && curscene && bfd->main->wm.first); @@ -192,9 +192,9 @@ static void setup_app_data( if (curscene == NULL) { curscene = BKE_scene_add(bfd->main, "Empty"); } - if (cur_render_layer == NULL) { + if (cur_view_layer == NULL) { /* fallback to scene layer */ - cur_render_layer = BKE_scene_layer_from_scene_get(curscene); + cur_view_layer = BKE_view_layer_from_scene_get(curscene); } if (track_undo_scene) { @@ -207,7 +207,7 @@ static void setup_app_data( } /* BKE_blender_globals_clear will free G.main, here we can still restore pointers */ - blo_lib_link_restore(bfd->main, CTX_wm_manager(C), curscene, cur_render_layer); + blo_lib_link_restore(bfd->main, CTX_wm_manager(C), curscene, cur_view_layer); if (win) { curscene = win->scene; } diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index d9280a84678..e222c189ddb 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -666,7 +666,7 @@ static bool camera_frame_fit_calc_from_data( /* don't move the camera, just yield the fit location */ /* r_scale only valid/useful for ortho cameras */ bool BKE_camera_view_frame_fit_to_scene( - Scene *scene, SceneLayer *sl, Object *camera_ob, float r_co[3], float *r_scale) + Scene *scene, ViewLayer *sl, Object *camera_ob, float r_co[3], float *r_scale) { CameraParams params; CameraViewFrameData data_cb; diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index 2a1157cf6b4..25305b1d25a 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -117,12 +117,12 @@ static bool collection_remlink(SceneCollection *sc_parent, SceneCollection *sc_g /** * Recursively remove any instance of this SceneCollection */ -static void layer_collection_remove(SceneLayer *sl, ListBase *lb, const SceneCollection *sc) +static void layer_collection_remove(ViewLayer *view_layer, ListBase *lb, const SceneCollection *sc) { LayerCollection *lc = lb->first; while (lc) { if (lc->scene_collection == sc) { - BKE_layer_collection_free(sl, lc); + BKE_layer_collection_free(view_layer, lc); BLI_remlink(lb, lc); LayerCollection *lc_next = lc->next; @@ -132,13 +132,13 @@ static void layer_collection_remove(SceneLayer *sl, ListBase *lb, const SceneCol /* only the "top-level" layer collections may have the * same SceneCollection in a sibling tree. */ - if (lb != &sl->layer_collections) { + if (lb != &view_layer->layer_collections) { return; } } else { - layer_collection_remove(sl, &lc->layer_collections, sc); + layer_collection_remove(view_layer, &lc->layer_collections, sc); lc = lc->next; } } @@ -165,9 +165,9 @@ bool BKE_collection_remove(Scene *scene, SceneCollection *sc) collection_free(sc, true); /* check all layers that use this collection and clear them */ - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { - layer_collection_remove(sl, &sl->layer_collections, sc); - sl->active_collection = 0; + for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + layer_collection_remove(view_layer, &view_layer->layer_collections, sc); + view_layer->active_collection = 0; } MEM_freeN(sc); @@ -258,13 +258,13 @@ void BKE_collection_object_add_from(Scene *scene, Object *ob_src, Object *ob_dst } FOREACH_SCENE_COLLECTION_END - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { - Base *base_src = BKE_scene_layer_base_find(sl, ob_src); + for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + Base *base_src = BKE_view_layer_base_find(view_layer, ob_src); if (base_src != NULL) { if (base_src->collection_properties == NULL) { continue; } - Base *base_dst = BKE_scene_layer_base_find(sl, ob_dst); + Base *base_dst = BKE_view_layer_base_find(view_layer, ob_dst); IDP_MergeGroup(base_dst->collection_properties, base_src->collection_properties, true); } } diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 0bd79a50673..216c1f3adc4 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -921,15 +921,15 @@ Scene *CTX_data_scene(const bContext *C) return C->data.scene; } -SceneLayer *CTX_data_scene_layer(const bContext *C) +ViewLayer *CTX_data_view_layer(const bContext *C) { - SceneLayer *sl; + ViewLayer *sl; - if (ctx_data_pointer_verify(C, "render_layer", (void *)&sl)) { + if (ctx_data_pointer_verify(C, "view_layer", (void *)&sl)) { return sl; } else { - return BKE_scene_layer_from_workspace_get(CTX_data_scene(C), CTX_wm_workspace(C)); + return BKE_view_layer_from_workspace_get(CTX_data_scene(C), CTX_wm_workspace(C)); } } @@ -957,16 +957,16 @@ RenderEngineType *CTX_data_engine(const bContext *C) * This is tricky. Sometimes the user overrides the render_layer * but not the scene_collection. In this case what to do? * - * If the scene_collection is linked to the SceneLayer we use it. - * Otherwise we fallback to the active one of the SceneLayer. + * If the scene_collection is linked to the ViewLayer we use it. + * Otherwise we fallback to the active one of the ViewLayer. */ LayerCollection *CTX_data_layer_collection(const bContext *C) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); LayerCollection *lc; if (ctx_data_pointer_verify(C, "layer_collection", (void *)&lc)) { - if (BKE_scene_layer_has_collection(sl, lc->scene_collection)) { + if (BKE_view_layer_has_collection(sl, lc->scene_collection)) { return lc; } } @@ -979,7 +979,7 @@ SceneCollection *CTX_data_scene_collection(const bContext *C) { SceneCollection *sc; if (ctx_data_pointer_verify(C, "scene_collection", (void *)&sc)) { - if (BKE_scene_layer_has_collection(CTX_data_scene_layer(C), sc)) { + if (BKE_view_layer_has_collection(CTX_data_view_layer(C), sc)) { return sc; } } @@ -1259,8 +1259,8 @@ int CTX_data_editable_gpencil_strokes(const bContext *C, ListBase *list) Depsgraph *CTX_data_depsgraph(const bContext *C) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); - return BKE_scene_get_depsgraph(scene, scene_layer, true); + ViewLayer *view_layer = CTX_data_view_layer(C); + return BKE_scene_get_depsgraph(scene, view_layer, true); } void CTX_data_eval_ctx(const bContext *C, EvaluationContext *eval_ctx) @@ -1268,9 +1268,9 @@ void CTX_data_eval_ctx(const bContext *C, EvaluationContext *eval_ctx) BLI_assert(C != NULL); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); RenderEngineType *engine = CTX_data_engine(C); DEG_evaluation_context_init_from_scene(eval_ctx, - scene, scene_layer, engine, + scene, view_layer, engine, DAG_EVAL_VIEWPORT); } diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 728167efa04..394075c1792 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -488,7 +488,7 @@ static void scene_setSubframe(Scene *scene, float subframe) scene->r.subframe = subframe; } -static int surface_getBrushFlags(DynamicPaintSurface *surface, const SceneLayer *sl) +static int surface_getBrushFlags(DynamicPaintSurface *surface, const ViewLayer *sl) { Base *base = NULL; GroupObject *go = NULL; @@ -5639,7 +5639,7 @@ static void dynamic_paint_generate_bake_data_cb(void *userdata, const int index) } } -static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, const SceneLayer *sl, Object *ob) +static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, const ViewLayer *sl, Object *ob) { PaintSurfaceData *sData = surface->data; PaintBakeData *bData = sData->bData; @@ -5783,7 +5783,7 @@ static int dynamicPaint_doStep(const struct EvaluationContext *eval_ctx, Scene * GroupObject *go = NULL; Object *brushObj = NULL; ModifierData *md = NULL; - SceneLayer *sl = eval_ctx->scene_layer; + ViewLayer *sl = eval_ctx->view_layer; /* backup current scene frame */ int scene_frame = scene->r.cfra; @@ -5941,7 +5941,7 @@ int dynamicPaint_calculateFrame( dynamicPaint_applySurfaceDisplace(surface, surface->canvas->dm); /* update bake data */ - dynamicPaint_generateBakeData(surface, eval_ctx->scene_layer, cObject); + dynamicPaint_generateBakeData(surface, eval_ctx->view_layer, cObject); /* don't do substeps for first frame */ if (surface->substeps && (frame != surface->start_frame)) { diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index ce3e7dbf931..76132b02716 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -213,17 +213,17 @@ ListBase *pdInitEffectors( const struct EvaluationContext *eval_ctx, Scene *scene, Object *ob_src, ParticleSystem *psys_src, EffectorWeights *weights, bool for_simulation) { - SceneLayer *sl; + ViewLayer *sl; Base *base; unsigned int layer= ob_src->lay; ListBase *effectors = NULL; /* eval_ctx is NULL during deg build */ if (eval_ctx) { - sl = eval_ctx->scene_layer; + sl = eval_ctx->view_layer; } else { - sl = BKE_scene_layer_context_active_PLACEHOLDER(scene); + sl = BKE_view_layer_context_active_PLACEHOLDER(scene); } if (weights->group) { diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 39938f819ef..5e07ad02a07 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -57,9 +57,9 @@ /* prototype */ struct EngineSettingsCB_Type; -static void layer_collection_free(SceneLayer *sl, LayerCollection *lc); -static void layer_collection_objects_populate(SceneLayer *sl, LayerCollection *lc, ListBase *objects); -static LayerCollection *layer_collection_add(SceneLayer *sl, LayerCollection *parent, SceneCollection *sc); +static void layer_collection_free(ViewLayer *sl, LayerCollection *lc); +static void layer_collection_objects_populate(ViewLayer *sl, LayerCollection *lc, ListBase *objects); +static LayerCollection *layer_collection_add(ViewLayer *sl, LayerCollection *parent, SceneCollection *sc); static LayerCollection *find_layer_collection_by_scene_collection(LayerCollection *lc, const SceneCollection *sc); static IDProperty *collection_engine_settings_create(struct EngineSettingsCB_Type *ces_type, const bool populate); static IDProperty *collection_engine_get(IDProperty *root, const int type, const char *engine_name); @@ -70,60 +70,60 @@ static void object_bases_iterator_next(BLI_Iterator *iter, const int flag); /* RenderLayer */ /** - * Returns the SceneLayer to be used for rendering - * Most of the time BKE_scene_layer_from_workspace_get should be used instead + * Returns the ViewLayer to be used for rendering + * Most of the time BKE_view_layer_from_workspace_get should be used instead */ -SceneLayer *BKE_scene_layer_from_scene_get(const Scene *scene) +ViewLayer *BKE_view_layer_from_scene_get(const Scene *scene) { - SceneLayer *sl = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *sl = BLI_findlink(&scene->view_layers, scene->active_view_layer); BLI_assert(sl); return sl; } /** - * Returns the SceneLayer to be used for drawing, outliner, and other context related areas. + * Returns the ViewLayer to be used for drawing, outliner, and other context related areas. */ -SceneLayer *BKE_scene_layer_from_workspace_get(const struct Scene *scene, const struct WorkSpace *workspace) +ViewLayer *BKE_view_layer_from_workspace_get(const struct Scene *scene, const struct WorkSpace *workspace) { if (BKE_workspace_use_scene_settings_get(workspace)) { - return BKE_scene_layer_from_scene_get(scene); + return BKE_view_layer_from_scene_get(scene); } else { - return BKE_workspace_render_layer_get(workspace); + return BKE_workspace_view_layer_get(workspace); } } /** * This is a placeholder to know which areas of the code need to be addressed for the Workspace changes. - * Never use this, you should either use BKE_scene_layer_workspace_active or get SceneLayer explicitly. + * Never use this, you should either use BKE_view_layer_workspace_active or get ViewLayer explicitly. */ -SceneLayer *BKE_scene_layer_context_active_PLACEHOLDER(const Scene *scene) +ViewLayer *BKE_view_layer_context_active_PLACEHOLDER(const Scene *scene) { - return BKE_scene_layer_from_scene_get(scene); + return BKE_view_layer_from_scene_get(scene); } /** * Add a new renderlayer * by default, a renderlayer has the master collection */ -SceneLayer *BKE_scene_layer_add(Scene *scene, const char *name) +ViewLayer *BKE_view_layer_add(Scene *scene, const char *name) { if (!name) { name = DATA_("Render Layer"); } IDPropertyTemplate val = {0}; - SceneLayer *sl = MEM_callocN(sizeof(SceneLayer), "Scene Layer"); - sl->flag = SCENE_LAYER_RENDER | SCENE_LAYER_FREESTYLE; + ViewLayer *sl = MEM_callocN(sizeof(ViewLayer), "Scene Layer"); + sl->flag = VIEW_LAYER_RENDER | VIEW_LAYER_FREESTYLE; sl->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); layer_engine_settings_init(sl->properties, false); - BLI_addtail(&scene->render_layers, sl); + BLI_addtail(&scene->view_layers, sl); /* unique name */ BLI_strncpy_utf8(sl->name, name, sizeof(sl->name)); - BLI_uniquename(&scene->render_layers, sl, DATA_("SceneLayer"), '.', offsetof(SceneLayer, name), sizeof(sl->name)); + BLI_uniquename(&scene->view_layers, sl, DATA_("ViewLayer"), '.', offsetof(ViewLayer, name), sizeof(sl->name)); SceneCollection *sc = BKE_collection_master(scene); layer_collection_add(sl, NULL, sc); @@ -138,9 +138,9 @@ SceneLayer *BKE_scene_layer_add(Scene *scene, const char *name) } /** - * Free (or release) any data used by this SceneLayer. + * Free (or release) any data used by this ViewLayer. */ -void BKE_scene_layer_free(SceneLayer *sl) +void BKE_view_layer_free(ViewLayer *sl) { sl->basact = NULL; @@ -167,7 +167,7 @@ void BKE_scene_layer_free(SceneLayer *sl) MEM_freeN(sl->properties_evaluated); } - for (SceneLayerEngineData *sled = sl->drawdata.first; sled; sled = sled->next) { + for (ViewLayerEngineData *sled = sl->drawdata.first; sled; sled = sled->next) { if (sled->storage) { if (sled->free) { sled->free(sled->storage); @@ -192,7 +192,7 @@ void BKE_scene_layer_free(SceneLayer *sl) /** * Tag all the selected objects of a renderlayer */ -void BKE_scene_layer_selected_objects_tag(SceneLayer *sl, const int tag) +void BKE_view_layer_selected_objects_tag(ViewLayer *sl, const int tag) { for (Base *base = sl->object_bases.first; base; base = base->next) { if ((base->flag & BASE_SELECTED) != 0) { @@ -220,13 +220,13 @@ static bool find_scene_collection_in_scene_collections(ListBase *lb, const Layer /** * Fallback for when a Scene has no camera to use * - * \param scene_layer: in general you want to use the same SceneLayer that is used + * \param view_layer: in general you want to use the same ViewLayer that is used * for depsgraph. If rendering you pass the scene active layer, when viewing in the viewport - * you want to get SceneLayer from context. + * you want to get ViewLayer from context. */ -Object *BKE_scene_layer_camera_find(SceneLayer *scene_layer) +Object *BKE_view_layer_camera_find(ViewLayer *view_layer) { - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { if (base->object->type == OB_CAMERA) { return base->object; } @@ -236,11 +236,11 @@ Object *BKE_scene_layer_camera_find(SceneLayer *scene_layer) } /** - * Find the SceneLayer a LayerCollection belongs to + * Find the ViewLayer a LayerCollection belongs to */ -SceneLayer *BKE_scene_layer_find_from_collection(const Scene *scene, LayerCollection *lc) +ViewLayer *BKE_view_layer_find_from_collection(const Scene *scene, LayerCollection *lc) { - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { if (find_scene_collection_in_scene_collections(&sl->layer_collections, lc)) { return sl; } @@ -250,12 +250,12 @@ SceneLayer *BKE_scene_layer_find_from_collection(const Scene *scene, LayerCollec /* Base */ -Base *BKE_scene_layer_base_find(SceneLayer *sl, Object *ob) +Base *BKE_view_layer_base_find(ViewLayer *sl, Object *ob) { return BLI_findptr(&sl->object_bases, ob, offsetof(Base, object)); } -void BKE_scene_layer_base_deselect_all(SceneLayer *sl) +void BKE_view_layer_base_deselect_all(ViewLayer *sl) { Base *base; @@ -264,7 +264,7 @@ void BKE_scene_layer_base_deselect_all(SceneLayer *sl) } } -void BKE_scene_layer_base_select(struct SceneLayer *sl, Base *selbase) +void BKE_view_layer_base_select(struct ViewLayer *sl, Base *selbase) { sl->basact = selbase; if ((selbase->flag & BASE_SELECTABLED) != 0) { @@ -272,7 +272,7 @@ void BKE_scene_layer_base_select(struct SceneLayer *sl, Base *selbase) } } -static void scene_layer_object_base_unref(SceneLayer *sl, Base *base) +static void view_layer_object_base_unref(ViewLayer *sl, Base *base) { base->refcount--; @@ -296,10 +296,10 @@ static void scene_layer_object_base_unref(SceneLayer *sl, Base *base) * Return the base if existent, or create it if necessary * Always bump the refcount */ -static Base *object_base_add(SceneLayer *sl, Object *ob) +static Base *object_base_add(ViewLayer *sl, Object *ob) { Base *base; - base = BKE_scene_layer_base_find(sl, ob); + base = BKE_view_layer_base_find(sl, ob); if (base == NULL) { base = MEM_callocN(sizeof(Base), "Object Base"); @@ -318,11 +318,11 @@ static Base *object_base_add(SceneLayer *sl, Object *ob) /* LayerCollection */ -static void layer_collection_objects_unpopulate(SceneLayer *sl, LayerCollection *lc) +static void layer_collection_objects_unpopulate(ViewLayer *sl, LayerCollection *lc) { if (sl) { for (LinkData *link = lc->object_bases.first; link; link = link->next) { - scene_layer_object_base_unref(sl, link->data); + view_layer_object_base_unref(sl, link->data); } } @@ -330,10 +330,10 @@ static void layer_collection_objects_unpopulate(SceneLayer *sl, LayerCollection } /** - * When freeing the entire SceneLayer at once we don't bother with unref - * otherwise SceneLayer is passed to keep the syncing of the LayerCollection tree + * When freeing the entire ViewLayer at once we don't bother with unref + * otherwise ViewLayer is passed to keep the syncing of the LayerCollection tree */ -static void layer_collection_free(SceneLayer *sl, LayerCollection *lc) +static void layer_collection_free(ViewLayer *sl, LayerCollection *lc) { layer_collection_objects_unpopulate(sl, lc); BLI_freelistN(&lc->overrides); @@ -356,10 +356,10 @@ static void layer_collection_free(SceneLayer *sl, LayerCollection *lc) } /** - * Free (or release) LayerCollection from SceneLayer + * Free (or release) LayerCollection from ViewLayer * (does not free the LayerCollection itself). */ -void BKE_layer_collection_free(SceneLayer *sl, LayerCollection *lc) +void BKE_layer_collection_free(ViewLayer *sl, LayerCollection *lc) { layer_collection_free(sl, lc); } @@ -389,7 +389,7 @@ static LayerCollection *collection_from_index(ListBase *lb, const int number, in /** * Get the collection for a given index */ -LayerCollection *BKE_layer_collection_from_index(SceneLayer *sl, const int index) +LayerCollection *BKE_layer_collection_from_index(ViewLayer *sl, const int index) { int i = 0; return collection_from_index(&sl->layer_collections, index, &i); @@ -398,7 +398,7 @@ LayerCollection *BKE_layer_collection_from_index(SceneLayer *sl, const int index /** * Get the active collection */ -LayerCollection *BKE_layer_collection_get_active(SceneLayer *sl) +LayerCollection *BKE_layer_collection_get_active(ViewLayer *sl) { int i = 0; return collection_from_index(&sl->layer_collections, sl->active_collection, &i); @@ -409,13 +409,13 @@ LayerCollection *BKE_layer_collection_get_active(SceneLayer *sl) * Return layer collection to add new object(s). * Create one if none exists. */ -LayerCollection *BKE_layer_collection_get_active_ensure(Scene *scene, SceneLayer *sl) +LayerCollection *BKE_layer_collection_get_active_ensure(Scene *scene, ViewLayer *sl) { LayerCollection *lc = BKE_layer_collection_get_active(sl); if (lc == NULL) { BLI_assert(BLI_listbase_is_empty(&sl->layer_collections)); - /* When there is no collection linked to this SceneLayer, create one. */ + /* When there is no collection linked to this ViewLayer, create one. */ SceneCollection *sc = BKE_collection_add(scene, NULL, NULL); lc = BKE_collection_link(sl, sc); /* New collection has to be the active one. */ @@ -441,7 +441,7 @@ static int collection_count(ListBase *lb) * Get the total number of collections * (including all the nested collections) */ -int BKE_layer_collection_count(SceneLayer *sl) +int BKE_layer_collection_count(ViewLayer *sl) { return collection_count(&sl->layer_collections); } @@ -469,7 +469,7 @@ static int index_from_collection(ListBase *lb, const LayerCollection *lc, int *i /** * Return -1 if not found */ -int BKE_layer_collection_findindex(SceneLayer *sl, const LayerCollection *lc) +int BKE_layer_collection_findindex(ViewLayer *sl, const LayerCollection *lc) { int i = 0; return index_from_collection(&sl->layer_collections, lc, &i); @@ -520,13 +520,13 @@ static ListBase *scene_collection_listbase_find(ListBase *lb, SceneCollection *s /** * Nest a LayerCollection into another one - * Both collections must be from the same SceneLayer, return true if succeded. + * Both collections must be from the same ViewLayer, return true if succeded. * * The LayerCollection will effectively be moved into the * new (nested) position. So all the settings, overrides, ... go with it, and - * if the collection was directly linked to the SceneLayer it's then unlinked. + * if the collection was directly linked to the ViewLayer it's then unlinked. * - * For the other SceneLayers we simply resync the tree, without changing directly + * For the other ViewLayers we simply resync the tree, without changing directly * linked collections (even if they link to the same SceneCollection) * * \param lc_src LayerCollection to nest into \a lc_dst @@ -534,7 +534,7 @@ static ListBase *scene_collection_listbase_find(ListBase *lb, SceneCollection *s */ static void layer_collection_swap( - SceneLayer *sl, ListBase *lb_a, ListBase *lb_b, + ViewLayer *sl, ListBase *lb_a, ListBase *lb_b, LayerCollection *lc_a, LayerCollection *lc_b) { if (lb_a == NULL) { @@ -553,14 +553,14 @@ static void layer_collection_swap( /** * Move \a lc_src into \a lc_dst. Both have to be stored in \a sl. - * If \a lc_src is directly linked to the SceneLayer it's unlinked + * If \a lc_src is directly linked to the ViewLayer it's unlinked */ bool BKE_layer_collection_move_into(const Scene *scene, LayerCollection *lc_dst, LayerCollection *lc_src) { - SceneLayer *sl = BKE_scene_layer_find_from_collection(scene, lc_src); + ViewLayer *sl = BKE_view_layer_find_from_collection(scene, lc_src); bool is_directly_linked = false; - if ((!sl) || (sl != BKE_scene_layer_find_from_collection(scene, lc_dst))) { + if ((!sl) || (sl != BKE_view_layer_find_from_collection(scene, lc_dst))) { return false; } @@ -620,15 +620,15 @@ bool BKE_layer_collection_move_into(const Scene *scene, LayerCollection *lc_dst, /** * Move \a lc_src above \a lc_dst. Both have to be stored in \a sl. - * If \a lc_src is directly linked to the SceneLayer it's unlinked + * If \a lc_src is directly linked to the ViewLayer it's unlinked */ bool BKE_layer_collection_move_above(const Scene *scene, LayerCollection *lc_dst, LayerCollection *lc_src) { - SceneLayer *sl = BKE_scene_layer_find_from_collection(scene, lc_src); + ViewLayer *sl = BKE_view_layer_find_from_collection(scene, lc_src); const bool is_directly_linked_src = BLI_findindex(&sl->layer_collections, lc_src) != -1; const bool is_directly_linked_dst = BLI_findindex(&sl->layer_collections, lc_dst) != -1; - if ((!sl) || (sl != BKE_scene_layer_find_from_collection(scene, lc_dst))) { + if ((!sl) || (sl != BKE_view_layer_find_from_collection(scene, lc_dst))) { return false; } @@ -651,7 +651,7 @@ bool BKE_layer_collection_move_above(const Scene *scene, LayerCollection *lc_dst /* We don't allow to move above/below a directly linked collection * unless the source collection is also directly linked */ else if (is_directly_linked_dst) { - /* Both directly linked to the SceneLayer, just need to swap */ + /* Both directly linked to the ViewLayer, just need to swap */ if (is_directly_linked_src) { BLI_remlink(&sl->layer_collections, lc_src); BLI_insertlinkbefore(&sl->layer_collections, lc_dst, lc_src); @@ -695,15 +695,15 @@ bool BKE_layer_collection_move_above(const Scene *scene, LayerCollection *lc_dst /** * Move \a lc_src below \a lc_dst. Both have to be stored in \a sl. - * If \a lc_src is directly linked to the SceneLayer it's unlinked + * If \a lc_src is directly linked to the ViewLayer it's unlinked */ bool BKE_layer_collection_move_below(const Scene *scene, LayerCollection *lc_dst, LayerCollection *lc_src) { - SceneLayer *sl = BKE_scene_layer_find_from_collection(scene, lc_src); + ViewLayer *sl = BKE_view_layer_find_from_collection(scene, lc_src); const bool is_directly_linked_src = BLI_findindex(&sl->layer_collections, lc_src) != -1; const bool is_directly_linked_dst = BLI_findindex(&sl->layer_collections, lc_dst) != -1; - if ((!sl) || (sl != BKE_scene_layer_find_from_collection(scene, lc_dst))) { + if ((!sl) || (sl != BKE_view_layer_find_from_collection(scene, lc_dst))) { return false; } @@ -726,7 +726,7 @@ bool BKE_layer_collection_move_below(const Scene *scene, LayerCollection *lc_dst /* We don't allow to move above/below a directly linked collection * unless the source collection is also directly linked */ else if (is_directly_linked_dst) { - /* Both directly linked to the SceneLayer, just need to swap */ + /* Both directly linked to the ViewLayer, just need to swap */ if (is_directly_linked_src) { BLI_remlink(&sl->layer_collections, lc_src); BLI_insertlinkafter(&sl->layer_collections, lc_dst, lc_src); @@ -768,7 +768,7 @@ bool BKE_layer_collection_move_below(const Scene *scene, LayerCollection *lc_dst return true; } -static bool layer_collection_resync(SceneLayer *sl, LayerCollection *lc, const SceneCollection *sc) +static bool layer_collection_resync(ViewLayer *sl, LayerCollection *lc, const SceneCollection *sc) { if (lc->scene_collection == sc) { ListBase collections = {NULL}; @@ -811,7 +811,7 @@ static bool layer_collection_resync(SceneLayer *sl, LayerCollection *lc, const S */ void BKE_layer_collection_resync(const Scene *scene, const SceneCollection *sc) { - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) { layer_collection_resync(sl, lc, sc); } @@ -824,7 +824,7 @@ void BKE_layer_collection_resync(const Scene *scene, const SceneCollection *sc) * Link a collection to a renderlayer * The collection needs to be created separately */ -LayerCollection *BKE_collection_link(SceneLayer *sl, SceneCollection *sc) +LayerCollection *BKE_collection_link(ViewLayer *sl, SceneCollection *sc) { LayerCollection *lc = layer_collection_add(sl, NULL, sc); sl->active_collection = BKE_layer_collection_findindex(sl, lc); @@ -835,7 +835,7 @@ LayerCollection *BKE_collection_link(SceneLayer *sl, SceneCollection *sc) * Unlink a collection base from a renderlayer * The corresponding collection is not removed from the master collection */ -void BKE_collection_unlink(SceneLayer *sl, LayerCollection *lc) +void BKE_collection_unlink(ViewLayer *sl, LayerCollection *lc) { BKE_layer_collection_free(sl, lc); BLI_remlink(&sl->layer_collections, lc); @@ -846,7 +846,7 @@ void BKE_collection_unlink(SceneLayer *sl, LayerCollection *lc) /** * Recursively enable nested collections */ -static void layer_collection_enable(SceneLayer *sl, LayerCollection *lc) +static void layer_collection_enable(ViewLayer *sl, LayerCollection *lc) { layer_collection_objects_populate(sl, lc, &lc->scene_collection->objects); @@ -857,10 +857,10 @@ static void layer_collection_enable(SceneLayer *sl, LayerCollection *lc) /** * Enable collection - * Add its objects bases to SceneLayer + * Add its objects bases to ViewLayer * Depsgraph needs to be rebuilt afterwards */ -void BKE_collection_enable(SceneLayer *sl, LayerCollection *lc) +void BKE_collection_enable(ViewLayer *sl, LayerCollection *lc) { if ((lc->flag & COLLECTION_DISABLED) == 0) { return; @@ -873,7 +873,7 @@ void BKE_collection_enable(SceneLayer *sl, LayerCollection *lc) /** * Recursively disable nested collections */ -static void layer_collection_disable(SceneLayer *sl, LayerCollection *lc) +static void layer_collection_disable(ViewLayer *sl, LayerCollection *lc) { layer_collection_objects_unpopulate(sl, lc); @@ -884,10 +884,10 @@ static void layer_collection_disable(SceneLayer *sl, LayerCollection *lc) /** * Disable collection - * Remove all its object bases from SceneLayer + * Remove all its object bases from ViewLayer * Depsgraph needs to be rebuilt afterwards */ -void BKE_collection_disable(SceneLayer *sl, LayerCollection *lc) +void BKE_collection_disable(ViewLayer *sl, LayerCollection *lc) { if ((lc->flag & COLLECTION_DISABLED) != 0) { return; @@ -897,7 +897,7 @@ void BKE_collection_disable(SceneLayer *sl, LayerCollection *lc) layer_collection_disable(sl, lc); } -static void layer_collection_object_add(SceneLayer *sl, LayerCollection *lc, Object *ob) +static void layer_collection_object_add(ViewLayer *sl, LayerCollection *lc, Object *ob) { Base *base = object_base_add(sl, ob); @@ -922,26 +922,26 @@ static void layer_collection_object_add(SceneLayer *sl, LayerCollection *lc, Obj BLI_addtail(&lc->object_bases, BLI_genericNodeN(base)); } -static void layer_collection_object_remove(SceneLayer *sl, LayerCollection *lc, Object *ob) +static void layer_collection_object_remove(ViewLayer *sl, LayerCollection *lc, Object *ob) { Base *base; - base = BKE_scene_layer_base_find(sl, ob); + base = BKE_view_layer_base_find(sl, ob); LinkData *link = BLI_findptr(&lc->object_bases, base, offsetof(LinkData, data)); BLI_remlink(&lc->object_bases, link); MEM_freeN(link); - scene_layer_object_base_unref(sl, base); + view_layer_object_base_unref(sl, base); } -static void layer_collection_objects_populate(SceneLayer *sl, LayerCollection *lc, ListBase *objects) +static void layer_collection_objects_populate(ViewLayer *sl, LayerCollection *lc, ListBase *objects) { for (LinkData *link = objects->first; link; link = link->next) { layer_collection_object_add(sl, lc, link->data); } } -static void layer_collection_populate(SceneLayer *sl, LayerCollection *lc, SceneCollection *sc) +static void layer_collection_populate(ViewLayer *sl, LayerCollection *lc, SceneCollection *sc) { layer_collection_objects_populate(sl, lc, &sc->objects); layer_collection_objects_populate(sl, lc, &sc->filter_objects); @@ -951,7 +951,7 @@ static void layer_collection_populate(SceneLayer *sl, LayerCollection *lc, Scene } } -static LayerCollection *layer_collection_add(SceneLayer *sl, LayerCollection *parent, SceneCollection *sc) +static LayerCollection *layer_collection_add(ViewLayer *sl, LayerCollection *parent, SceneCollection *sc) { IDPropertyTemplate val = {0}; LayerCollection *lc = MEM_callocN(sizeof(LayerCollection), "Collection Base"); @@ -979,7 +979,7 @@ static LayerCollection *layer_collection_add(SceneLayer *sl, LayerCollection *pa /** * See if render layer has the scene collection linked directly, or indirectly (nested) */ -bool BKE_scene_layer_has_collection(SceneLayer *sl, const SceneCollection *sc) +bool BKE_view_layer_has_collection(ViewLayer *sl, const SceneCollection *sc) { for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) { if (find_layer_collection_by_scene_collection(lc, sc) != NULL) { @@ -994,8 +994,8 @@ bool BKE_scene_layer_has_collection(SceneLayer *sl, const SceneCollection *sc) */ bool BKE_scene_has_object(Scene *scene, Object *ob) { - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { - Base *base = BKE_scene_layer_base_find(sl, ob); + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { + Base *base = BKE_view_layer_base_find(sl, ob); if (base) { return true; } @@ -1023,11 +1023,11 @@ static LayerCollection *find_layer_collection_by_scene_collection(LayerCollectio } /** - * Add a new LayerCollection for all the SceneLayers that have sc_parent + * Add a new LayerCollection for all the ViewLayers that have sc_parent */ void BKE_layer_sync_new_scene_collection(Scene *scene, const SceneCollection *sc_parent, SceneCollection *sc) { - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) { LayerCollection *lc_parent = find_layer_collection_by_scene_collection(lc, sc_parent); if (lc_parent) { @@ -1042,7 +1042,7 @@ void BKE_layer_sync_new_scene_collection(Scene *scene, const SceneCollection *sc */ void BKE_layer_sync_object_link(const Scene *scene, SceneCollection *sc, Object *ob) { - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) { LayerCollection *found = find_layer_collection_by_scene_collection(lc, sc); if (found) { @@ -1058,7 +1058,7 @@ void BKE_layer_sync_object_link(const Scene *scene, SceneCollection *sc, Object */ void BKE_layer_sync_object_unlink(const Scene *scene, SceneCollection *sc, Object *ob) { - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) { LayerCollection *found = find_layer_collection_by_scene_collection(lc, sc); if (found) { @@ -1074,18 +1074,18 @@ void BKE_layer_sync_object_unlink(const Scene *scene, SceneCollection *sc, Objec /** * Add a new datablock override */ -void BKE_override_scene_layer_datablock_add(SceneLayer *scene_layer, int id_type, const char *data_path, const ID *id) +void BKE_override_view_layer_datablock_add(ViewLayer *view_layer, int id_type, const char *data_path, const ID *id) { - UNUSED_VARS(scene_layer, id_type, data_path, id); + UNUSED_VARS(view_layer, id_type, data_path, id); TODO_LAYER_OVERRIDE; } /** * Add a new int override */ -void BKE_override_scene_layer_int_add(SceneLayer *scene_layer, int id_type, const char *data_path, const int value) +void BKE_override_view_layer_int_add(ViewLayer *view_layer, int id_type, const char *data_path, const int value) { - UNUSED_VARS(scene_layer, id_type, data_path, value); + UNUSED_VARS(view_layer, id_type, data_path, value); TODO_LAYER_OVERRIDE; } @@ -1102,7 +1102,7 @@ void BKE_override_layer_collection_boolean_add(struct LayerCollection *layer_col /* Engine Settings */ ListBase R_layer_collection_engines_settings_callbacks = {NULL, NULL}; -ListBase R_scene_layer_engines_settings_callbacks = {NULL, NULL}; +ListBase R_view_layer_engines_settings_callbacks = {NULL, NULL}; typedef struct EngineSettingsCB_Type { struct EngineSettingsCB_Type *next, *prev; @@ -1128,7 +1128,7 @@ static void create_layer_collection_engine_settings_scene(Scene *scene, EngineSe create_engine_settings_scene(scene->collection_properties, es_type); } -static void create_scene_layer_engine_settings_scene(Scene *scene, EngineSettingsCB_Type *es_type) +static void create_view_layer_engine_settings_scene(Scene *scene, EngineSettingsCB_Type *es_type) { create_engine_settings_scene(scene->layer_properties, es_type); } @@ -1152,22 +1152,22 @@ static void create_layer_collection_engines_settings_scene(Scene *scene, EngineS /* Populate the scene with the new settings. */ create_layer_collection_engine_settings_scene(scene, es_type); - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) { create_layer_collection_engine_settings_collection(lc, es_type); } } } -static void create_scene_layer_engines_settings_scene(Scene *scene, EngineSettingsCB_Type *es_type) +static void create_view_layer_engines_settings_scene(Scene *scene, EngineSettingsCB_Type *es_type) { /* Populate the scene with the new settings. */ - create_scene_layer_engine_settings_scene(scene, es_type); + create_view_layer_engine_settings_scene(scene, es_type); } -static void create_scene_layer_engines_settings_layer(SceneLayer *sl, EngineSettingsCB_Type *es_type) +static void create_view_layer_engines_settings_layer(ViewLayer *sl, EngineSettingsCB_Type *es_type) { - if (BKE_scene_layer_engine_layer_get(sl, COLLECTION_MODE_NONE, es_type->name)) { + if (BKE_view_layer_engine_layer_get(sl, COLLECTION_MODE_NONE, es_type->name)) { return; } @@ -1209,19 +1209,19 @@ void BKE_layer_collection_engine_settings_callback_register( } } -void BKE_scene_layer_engine_settings_callback_register( +void BKE_view_layer_engine_settings_callback_register( Main *bmain, const char *engine_name, EngineSettingsCB func) { EngineSettingsCB_Type *es_type = - engine_settings_callback_register(engine_name, func, &R_scene_layer_engines_settings_callbacks); + engine_settings_callback_register(engine_name, func, &R_view_layer_engines_settings_callbacks); if (bmain) { /* Populate all of the collections of the scene with those settings. */ for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { - create_scene_layer_engines_settings_scene(scene, es_type); + create_view_layer_engines_settings_scene(scene, es_type); - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { - create_scene_layer_engines_settings_layer(sl, es_type); + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { + create_view_layer_engines_settings_layer(sl, es_type); } } } @@ -1232,9 +1232,9 @@ void BKE_layer_collection_engine_settings_callback_free(void) BLI_freelistN(&R_layer_collection_engines_settings_callbacks); } -void BKE_scene_layer_engine_settings_callback_free(void) +void BKE_view_layer_engine_settings_callback_free(void) { - BLI_freelistN(&R_scene_layer_engines_settings_callbacks); + BLI_freelistN(&R_view_layer_engines_settings_callbacks); } /** @@ -1331,10 +1331,10 @@ static void layer_collection_create_render_settings(IDProperty *root, const bool } } -static void scene_layer_create_render_settings(IDProperty *root, const bool populate) +static void view_layer_create_render_settings(IDProperty *root, const bool populate) { EngineSettingsCB_Type *es_type; - for (es_type = R_scene_layer_engines_settings_callbacks.first; es_type; es_type = es_type->next) { + for (es_type = R_view_layer_engines_settings_callbacks.first; es_type; es_type = es_type->next) { IDProperty *props = collection_engine_settings_create(es_type, populate); IDP_AddToGroup(root, props); } @@ -1432,7 +1432,7 @@ IDProperty *BKE_layer_collection_engine_scene_get(Scene *scene, const int type, /** * Return scene layer engine settings for specified engine in the scene */ -IDProperty *BKE_scene_layer_engine_scene_get(Scene *scene, const int type, const char *engine_name) +IDProperty *BKE_view_layer_engine_scene_get(Scene *scene, const int type, const char *engine_name) { return collection_engine_get(scene->layer_properties, type, engine_name); } @@ -1440,7 +1440,7 @@ IDProperty *BKE_scene_layer_engine_scene_get(Scene *scene, const int type, const /** * Return scene layer engine settings for specified engine */ -IDProperty *BKE_scene_layer_engine_layer_get(SceneLayer *sl, const int type, const char *engine_name) +IDProperty *BKE_view_layer_engine_layer_get(ViewLayer *sl, const int type, const char *engine_name) { return collection_engine_get(sl->properties, type, engine_name); } @@ -1448,7 +1448,7 @@ IDProperty *BKE_scene_layer_engine_layer_get(SceneLayer *sl, const int type, con /** * Return scene layer evaluated engine settings for specified engine */ -IDProperty *BKE_scene_layer_engine_evaluated_get(SceneLayer *sl, const int type, const char *engine_name) +IDProperty *BKE_view_layer_engine_evaluated_get(ViewLayer *sl, const int type, const char *engine_name) { return collection_engine_get(sl->properties_evaluated, type, engine_name); } @@ -1553,7 +1553,7 @@ static void collection_engine_settings_init(IDProperty *root, const bool populat static void layer_engine_settings_init(IDProperty *root, const bool populate) { /* render engines */ - scene_layer_create_render_settings(root, populate); + view_layer_create_render_settings(root, populate); /* mode engines */ layer_create_mode_settings(root, populate); @@ -1572,7 +1572,7 @@ void BKE_layer_collection_engine_settings_create(IDProperty *root) * Initialize the render setings * It's used mainly for scenes */ -void BKE_scene_layer_engine_settings_create(IDProperty *root) +void BKE_view_layer_engine_settings_create(IDProperty *root) { layer_engine_settings_init(root, true); } @@ -1586,11 +1586,11 @@ static struct { IDProperty *collection_properties; IDProperty *render_settings; } scene; - IDProperty *scene_layer; + IDProperty *view_layer; IDProperty *layer_collection; } root_reference = { .scene = {NULL, NULL}, - .scene_layer = NULL, + .view_layer = NULL, .layer_collection = NULL, }; @@ -1618,9 +1618,9 @@ static void engine_settings_validate_init(void) layer_engine_settings_init(root_reference.scene.render_settings, true); } - if (root_reference.scene_layer == NULL) { - root_reference.scene_layer = IDP_New(IDP_GROUP, &val, ROOT_PROP); - layer_engine_settings_init(root_reference.scene_layer, false); + if (root_reference.view_layer == NULL) { + root_reference.view_layer = IDP_New(IDP_GROUP, &val, ROOT_PROP); + layer_engine_settings_init(root_reference.view_layer, false); } } @@ -1632,7 +1632,7 @@ static void layer_collection_engine_settings_validate_free(void) IDProperty *idprops[] = { root_reference.scene.render_settings, root_reference.scene.collection_properties, - root_reference.scene_layer, + root_reference.view_layer, root_reference.layer_collection, NULL, }; @@ -1683,7 +1683,7 @@ void BKE_layer_collection_engine_settings_validate_collection(LayerCollection *l /** * Make sure Scene has all required collection settings. */ -void BKE_scene_layer_engine_settings_validate_scene(Scene *scene) +void BKE_view_layer_engine_settings_validate_scene(Scene *scene) { if (root_reference.scene.render_settings == NULL) { engine_settings_validate_init(); @@ -1692,7 +1692,7 @@ void BKE_scene_layer_engine_settings_validate_scene(Scene *scene) if (scene->layer_properties == NULL) { IDPropertyTemplate val = {0}; scene->layer_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); - BKE_scene_layer_engine_settings_create(scene->layer_properties); + BKE_view_layer_engine_settings_create(scene->layer_properties); } else { IDP_MergeGroup(scene->layer_properties, root_reference.scene.render_settings, false); @@ -1702,13 +1702,13 @@ void BKE_scene_layer_engine_settings_validate_scene(Scene *scene) /** * Make sure Scene has all required collection settings. */ -void BKE_scene_layer_engine_settings_validate_layer(SceneLayer *sl) +void BKE_view_layer_engine_settings_validate_layer(ViewLayer *sl) { - if (root_reference.scene_layer == NULL) { + if (root_reference.view_layer == NULL) { engine_settings_validate_init(); } - IDP_MergeGroup(sl->properties, root_reference.scene_layer, false); + IDP_MergeGroup(sl->properties, root_reference.view_layer, false); } /* ---------------------------------------------------------------------- */ @@ -1716,7 +1716,7 @@ void BKE_scene_layer_engine_settings_validate_layer(SceneLayer *sl) static void object_bases_iterator_begin(BLI_Iterator *iter, void *data_in, const int flag) { - SceneLayer *sl = data_in; + ViewLayer *sl = data_in; Base *base = sl->object_bases.first; /* when there are no objects */ @@ -1834,17 +1834,17 @@ void BKE_renderable_objects_iterator_begin(BLI_Iterator *iter, void *data_in) ObjectsRenderableIteratorData *data = data_in; for (Scene *scene = data->scene; scene; scene = scene->set) { - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { for (Base *base = sl->object_bases.first; base; base = base->next) { base->object->id.flag |= LIB_TAG_DOIT; } } } - SceneLayer *scene_layer = data->scene->render_layers.first; - data->iter.scene_layer = scene_layer; + ViewLayer *view_layer = data->scene->view_layers.first; + data->iter.view_layer = view_layer; - Base base = {(Base *)scene_layer->object_bases.first, NULL}; + Base base = {(Base *)view_layer->object_bases.first, NULL}; data->iter.base = &base; data->iter.set = NULL; @@ -1873,11 +1873,11 @@ void BKE_renderable_objects_iterator_next(BLI_Iterator *iter) /* Time to go to the next scene layer. */ if (data->iter.set == NULL) { - while ((data->iter.scene_layer = data->iter.scene_layer->next)) { - SceneLayer *scene_layer = data->iter.scene_layer; - if (scene_layer->flag & SCENE_LAYER_RENDER) { + while ((data->iter.view_layer = data->iter.view_layer->next)) { + ViewLayer *view_layer = data->iter.view_layer; + if (view_layer->flag & VIEW_LAYER_RENDER) { - Base base_iter = {(Base *)scene_layer->object_bases.first, NULL}; + Base base_iter = {(Base *)view_layer->object_bases.first, NULL}; data->iter.base = &base_iter; BKE_renderable_objects_iterator_next(iter); @@ -1894,9 +1894,9 @@ void BKE_renderable_objects_iterator_next(BLI_Iterator *iter) /* Look for an object in the next set. */ while ((data->iter.set = data->iter.set->set)) { - SceneLayer *scene_layer = BKE_scene_layer_from_scene_get(data->iter.set); + ViewLayer *view_layer = BKE_view_layer_from_scene_get(data->iter.set); - Base base_iter = {(Base *)scene_layer->object_bases.first, NULL}; + Base base_iter = {(Base *)view_layer->object_bases.first, NULL}; data->iter.base = &base_iter; BKE_renderable_objects_iterator_next(iter); @@ -1934,20 +1934,20 @@ static void idproperty_reset(IDProperty **props, IDProperty *props_ref) } void BKE_layer_eval_layer_collection_pre(const struct EvaluationContext *UNUSED(eval_ctx), - Scene *scene, SceneLayer *scene_layer) + Scene *scene, ViewLayer *view_layer) { - DEBUG_PRINT("%s on %s (%p)\n", __func__, scene_layer->name, scene_layer); - for (Base *base = scene_layer->object_bases.first; base != NULL; base = base->next) { + DEBUG_PRINT("%s on %s (%p)\n", __func__, view_layer->name, view_layer); + for (Base *base = view_layer->object_bases.first; base != NULL; base = base->next) { base->flag &= ~(BASE_VISIBLED | BASE_SELECTABLED); idproperty_reset(&base->collection_properties, scene->collection_properties); } /* Sync properties from scene to scene layer. */ - idproperty_reset(&scene_layer->properties_evaluated, scene->layer_properties); - IDP_MergeGroup(scene_layer->properties_evaluated, scene_layer->properties, true); + idproperty_reset(&view_layer->properties_evaluated, scene->layer_properties); + IDP_MergeGroup(view_layer->properties_evaluated, view_layer->properties, true); /* TODO(sergey): Is it always required? */ - scene_layer->flag |= SCENE_LAYER_ENGINE_DIRTY; + view_layer->flag |= VIEW_LAYER_ENGINE_DIRTY; } void BKE_layer_eval_layer_collection(const struct EvaluationContext *UNUSED(eval_ctx), @@ -1998,11 +1998,11 @@ void BKE_layer_eval_layer_collection(const struct EvaluationContext *UNUSED(eval } void BKE_layer_eval_layer_collection_post(const struct EvaluationContext *UNUSED(eval_ctx), - SceneLayer *scene_layer) + ViewLayer *view_layer) { - DEBUG_PRINT("%s on %s (%p)\n", __func__, scene_layer->name, scene_layer); + DEBUG_PRINT("%s on %s (%p)\n", __func__, view_layer->name, view_layer); /* if base is not selectabled, clear select */ - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { if ((base->flag & BASE_SELECTABLED) == 0) { base->flag &= ~BASE_SELECTED; } diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index d83cd2392fd..93bc4be7954 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -451,19 +451,19 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call } FOREACH_SCENE_COLLECTION_END - SceneLayer *scene_layer; - for (scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + ViewLayer *view_layer; + for (view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { CALLBACK_INVOKE(base->object, IDWALK_NOP); } - for (FreestyleModuleConfig *fmc = scene_layer->freestyle_config.modules.first; fmc; fmc = fmc->next) { + for (FreestyleModuleConfig *fmc = view_layer->freestyle_config.modules.first; fmc; fmc = fmc->next) { if (fmc->script) { CALLBACK_INVOKE(fmc->script, IDWALK_CB_NOP); } } - for (FreestyleLineSet *fls = scene_layer->freestyle_config.linesets.first; fls; fls = fls->next) { + for (FreestyleLineSet *fls = view_layer->freestyle_config.linesets.first; fls; fls = fls->next) { if (fls->group) { CALLBACK_INVOKE(fls->group, IDWALK_CB_USER); } diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index c82c002ebb1..3a69eb2b86b 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -215,7 +215,7 @@ void BKE_linestyle_make_local(struct Main *bmain, FreestyleLineStyle *linestyle, FreestyleLineStyle *BKE_linestyle_active_from_scene(Scene *scene) { - SceneLayer *active_render_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *active_render_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); if (active_render_layer) { FreestyleConfig *config = &active_render_layer->freestyle_config; FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(config); diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index d5cddf34eb5..1a93746b515 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -372,7 +372,7 @@ Object *BKE_mball_basis_find(Scene *scene, Object *basis) BLI_split_name_num(basisname, &basisnr, basis->id.name + 2, '.'); - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { for (Base *base = sl->object_bases.first; base; base = base->next) { Object *ob = base->object; if ((ob->type == OB_MBALL) && !(base->flag & OB_FROMDUPLI)) { diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 972596b0cb1..95394f6be63 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -715,13 +715,13 @@ Object *BKE_object_add_only_object(Main *bmain, int type, const char *name) } -static Object *object_add_common(Main *bmain, SceneLayer *scene_layer, int type, const char *name) +static Object *object_add_common(Main *bmain, ViewLayer *view_layer, int type, const char *name) { Object *ob; ob = BKE_object_add_only_object(bmain, type, name); ob->data = BKE_object_obdata_add_from_type(bmain, type, name); - BKE_scene_layer_base_deselect_all(scene_layer); + BKE_view_layer_base_deselect_all(view_layer); DEG_id_tag_update_ex(bmain, &ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); return ob; @@ -731,24 +731,24 @@ static Object *object_add_common(Main *bmain, SceneLayer *scene_layer, int type, * General add: to scene, with layer from area and default name * * Object is added to the active SceneCollection. - * If there is no linked collection to the active SceneLayer we create a new one. + * If there is no linked collection to the active ViewLayer we create a new one. */ /* creates minimum required data, but without vertices etc. */ Object *BKE_object_add( - Main *bmain, Scene *scene, SceneLayer *scene_layer, + Main *bmain, Scene *scene, ViewLayer *view_layer, int type, const char *name) { Object *ob; Base *base; LayerCollection *layer_collection; - ob = object_add_common(bmain, scene_layer, type, name); + ob = object_add_common(bmain, view_layer, type, name); - layer_collection = BKE_layer_collection_get_active_ensure(scene, scene_layer); + layer_collection = BKE_layer_collection_get_active_ensure(scene, view_layer); BKE_collection_object_add(scene, layer_collection->scene_collection, ob); - base = BKE_scene_layer_base_find(scene_layer, ob); - BKE_scene_layer_base_select(scene_layer, base); + base = BKE_view_layer_base_find(view_layer, ob); + BKE_view_layer_base_select(view_layer, base); return ob; } @@ -759,17 +759,17 @@ Object *BKE_object_add( * /param ob_src object to use to determine the collections of the new object. */ Object *BKE_object_add_from( - Main *bmain, Scene *scene, SceneLayer *scene_layer, + Main *bmain, Scene *scene, ViewLayer *view_layer, int type, const char *name, Object *ob_src) { Object *ob; Base *base; - ob = object_add_common(bmain, scene_layer, type, name); + ob = object_add_common(bmain, view_layer, type, name); BKE_collection_object_add_from(scene, ob_src, ob); - base = BKE_scene_layer_base_find(scene_layer, ob); - BKE_scene_layer_base_select(scene_layer, base); + base = BKE_view_layer_base_find(view_layer, ob); + BKE_view_layer_base_select(view_layer, base); return ob; } @@ -864,7 +864,7 @@ static LodLevel *lod_level_select(Object *ob, const float camera_position[3]) return current; } -bool BKE_object_lod_is_usable(Object *ob, SceneLayer *sl) +bool BKE_object_lod_is_usable(Object *ob, ViewLayer *sl) { bool active = (sl) ? ob == OBACT(sl) : false; return (ob->mode == OB_MODE_OBJECT || !active); @@ -880,7 +880,7 @@ void BKE_object_lod_update(Object *ob, const float camera_position[3]) } } -static Object *lod_ob_get(Object *ob, SceneLayer *sl, int flag) +static Object *lod_ob_get(Object *ob, ViewLayer *sl, int flag) { LodLevel *current = ob->currentlod; @@ -894,12 +894,12 @@ static Object *lod_ob_get(Object *ob, SceneLayer *sl, int flag) return current->source; } -struct Object *BKE_object_lod_meshob_get(Object *ob, SceneLayer *sl) +struct Object *BKE_object_lod_meshob_get(Object *ob, ViewLayer *sl) { return lod_ob_get(ob, sl, OB_LOD_USE_MESH); } -struct Object *BKE_object_lod_matob_get(Object *ob, SceneLayer *sl) +struct Object *BKE_object_lod_matob_get(Object *ob, ViewLayer *sl) { return lod_ob_get(ob, sl, OB_LOD_USE_MAT); } @@ -2566,7 +2566,7 @@ void BKE_object_foreach_display_point( } void BKE_scene_foreach_display_point( - Scene *scene, SceneLayer *sl, + Scene *scene, ViewLayer *sl, void (*func_cb)(const float[3], void *), void *user_data) { Base *base; @@ -3370,19 +3370,19 @@ static void obrel_list_add(LinkNode **links, Object *ob) * If OB_SET_VISIBLE or OB_SET_SELECTED are collected, * then also add related objects according to the given includeFilters. */ -LinkNode *BKE_object_relational_superset(struct SceneLayer *scene_layer, eObjectSet objectSet, eObRelationTypes includeFilter) +LinkNode *BKE_object_relational_superset(struct ViewLayer *view_layer, eObjectSet objectSet, eObRelationTypes includeFilter) { LinkNode *links = NULL; Base *base; /* Remove markers from all objects */ - for (base = scene_layer->object_bases.first; base; base = base->next) { + for (base = view_layer->object_bases.first; base; base = base->next) { base->object->id.tag &= ~LIB_TAG_DOIT; } /* iterate over all selected and visible objects */ - for (base = scene_layer->object_bases.first; base; base = base->next) { + for (base = view_layer->object_bases.first; base; base = base->next) { if (objectSet == OB_SET_ALL) { /* as we get all anyways just add it */ Object *ob = base->object; @@ -3419,7 +3419,7 @@ LinkNode *BKE_object_relational_superset(struct SceneLayer *scene_layer, eObject /* child relationship */ if (includeFilter & (OB_REL_CHILDREN | OB_REL_CHILDREN_RECURSIVE)) { Base *local_base; - for (local_base = scene_layer->object_bases.first; local_base; local_base = local_base->next) { + for (local_base = view_layer->object_bases.first; local_base; local_base = local_base->next) { if (BASE_EDITABLE_BGMODE(local_base)) { Object *child = local_base->object; diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index bfc99e1f238..85635cb7d77 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -75,7 +75,7 @@ typedef struct DupliContext { Group *group; /* XXX child objects are selected from this group if set, could be nicer */ Scene *scene; - SceneLayer *scene_layer; + ViewLayer *view_layer; Object *object; float space_mat[4][4]; @@ -100,7 +100,7 @@ static void init_context(DupliContext *r_ctx, const EvaluationContext *eval_ctx, { r_ctx->eval_ctx = eval_ctx; r_ctx->scene = scene; - r_ctx->scene_layer = eval_ctx->scene_layer; + r_ctx->view_layer = eval_ctx->view_layer; /* don't allow BKE_object_handle_update for viewport during render, can crash */ r_ctx->do_update = update && !(G.is_rendering && eval_ctx->mode != DAG_EVAL_RENDER); r_ctx->animated = false; @@ -258,8 +258,8 @@ static void make_child_duplis(const DupliContext *ctx, void *userdata, MakeChild } else { int baseid = 0; - SceneLayer *scene_layer = ctx->scene_layer; - for (Base *base = scene_layer->object_bases.first; base; base = base->next, baseid++) { + ViewLayer *view_layer = ctx->view_layer; + for (Base *base = view_layer->object_bases.first; base; base = base->next, baseid++) { Object *ob = base->object; if ((base->flag & BASE_VISIBLED) && ob != obedit && is_child(ob, parent)) { DupliContext pctx; diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index a2c59434862..df5851f927c 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -75,7 +75,7 @@ const char PAINT_CURSOR_TEXTURE_PAINT[3] = {255, 255, 255}; static eOverlayControlFlags overlay_flags = 0; -void BKE_paint_invalidate_overlay_tex(Scene *scene, SceneLayer *sl, const Tex *tex) +void BKE_paint_invalidate_overlay_tex(Scene *scene, ViewLayer *sl, const Tex *tex) { Paint *p = BKE_paint_get_active(scene, sl); Brush *br = p->brush; @@ -89,7 +89,7 @@ void BKE_paint_invalidate_overlay_tex(Scene *scene, SceneLayer *sl, const Tex *t overlay_flags |= PAINT_INVALID_OVERLAY_TEXTURE_SECONDARY; } -void BKE_paint_invalidate_cursor_overlay(Scene *scene, SceneLayer *sl, CurveMapping *curve) +void BKE_paint_invalidate_cursor_overlay(Scene *scene, ViewLayer *sl, CurveMapping *curve) { Paint *p = BKE_paint_get_active(scene, sl); Brush *br = p->brush; @@ -157,7 +157,7 @@ Paint *BKE_paint_get_active_from_paintmode(Scene *sce, ePaintMode mode) return NULL; } -Paint *BKE_paint_get_active(Scene *sce, SceneLayer *sl) +Paint *BKE_paint_get_active(Scene *sce, ViewLayer *sl) { if (sce && sl) { ToolSettings *ts = sce->toolsettings; @@ -189,7 +189,7 @@ Paint *BKE_paint_get_active(Scene *sce, SceneLayer *sl) Paint *BKE_paint_get_active_from_context(const bContext *C) { Scene *sce = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); SpaceImage *sima; if (sce && sl) { @@ -240,7 +240,7 @@ Paint *BKE_paint_get_active_from_context(const bContext *C) ePaintMode BKE_paintmode_get_active_from_context(const bContext *C) { Scene *sce = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); SpaceImage *sima; if (sce && sl) { diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index ee1c94554e3..209c7398d38 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -252,7 +252,7 @@ struct LatticeDeformData *psys_create_lattice_deform_data(ParticleSimulationData { struct LatticeDeformData *lattice_deform_data = NULL; - if (psys_in_edit_mode(sim->eval_ctx->scene_layer, sim->psys) == 0) { + if (psys_in_edit_mode(sim->eval_ctx->view_layer, sim->psys) == 0) { Object *lattice = NULL; ModifierData *md = (ModifierData *)psys_get_modifier(sim->ob, sim->psys); int mode = G.is_rendering ? eModifierMode_Render : eModifierMode_Realtime; @@ -289,11 +289,11 @@ void psys_enable_all(Object *ob) psys->flag &= ~PSYS_DISABLED; } -bool psys_in_edit_mode(SceneLayer *scene_layer, ParticleSystem *psys) +bool psys_in_edit_mode(ViewLayer *view_layer, ParticleSystem *psys) { - return (scene_layer->basact && - (scene_layer->basact->object->mode & OB_MODE_PARTICLE_EDIT) && - psys == psys_get_current((scene_layer->basact)->object) && + return (view_layer->basact && + (view_layer->basact->object->mode & OB_MODE_PARTICLE_EDIT) && + psys == psys_get_current((view_layer->basact)->object) && (psys->edit || psys->pointcache->edit) && !psys->renderdata); } @@ -2097,7 +2097,7 @@ static bool psys_thread_context_init_path( psys_thread_context_init(ctx, sim); /*---start figuring out what is actually wanted---*/ - if (psys_in_edit_mode(sim->eval_ctx->scene_layer, psys)) { + if (psys_in_edit_mode(sim->eval_ctx->view_layer, psys)) { ParticleEditSettings *pset = &scene->toolsettings->particle; if ((psys->renderdata == 0 && use_render_params == 0) && (psys->edit == NULL || pset->flag & PE_DRAW_PART) == 0) @@ -2186,7 +2186,7 @@ static void psys_thread_create_path(ParticleTask *task, struct ChildParticle *cp ParticleSystem *psys = ctx->sim.psys; ParticleSettings *part = psys->part; ParticleCacheKey **cache = psys->childcache; - ParticleCacheKey **pcache = psys_in_edit_mode(ctx->sim.eval_ctx->scene_layer, psys) && psys->edit ? psys->edit->pathcache : psys->pathcache; + ParticleCacheKey **pcache = psys_in_edit_mode(ctx->sim.eval_ctx->view_layer, psys) && psys->edit ? psys->edit->pathcache : psys->pathcache; ParticleCacheKey *child, *key[4]; ParticleTexture ptex; float *cpa_fuv = 0, *par_rot = 0, rot[4]; @@ -2595,7 +2595,7 @@ void psys_cache_paths(ParticleSimulationData *sim, float cfra, const bool use_re if ((psys->flag & PSYS_HAIR_DONE || psys->flag & PSYS_KEYED || psys->pointcache) == 0) return; - if (psys_in_edit_mode(sim->eval_ctx->scene_layer, psys)) + if (psys_in_edit_mode(sim->eval_ctx->view_layer, psys)) if (psys->renderdata == 0 && (psys->edit == NULL || pset->flag & PE_DRAW_PART) == 0) return; @@ -3778,7 +3778,7 @@ void psys_get_particle_on_path(ParticleSimulationData *sim, int p, ParticleKey * pind.bspline = (psys->part->flag & PART_HAIR_BSPLINE); /* pind.dm disabled in editmode means we don't get effectors taken into * account when subdividing for instance */ - pind.dm = psys_in_edit_mode(sim->eval_ctx->scene_layer, psys) ? NULL : psys->hair_out_dm; + pind.dm = psys_in_edit_mode(sim->eval_ctx->view_layer, psys) ? NULL : psys->hair_out_dm; init_particle_interpolation(sim->ob, psys, pa, &pind); do_particle_interpolation(psys, p, pa, t, &pind, state); diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 14f67aaea39..da227514512 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2933,7 +2933,7 @@ static void psys_update_path_cache(ParticleSimulationData *sim, float cfra, cons skip = 1; /* draw visualization */ else if (psys->pointcache->flag & PTCACHE_BAKING) skip = 1; /* no need to cache paths while baking dynamics */ - else if (psys_in_edit_mode(sim->eval_ctx->scene_layer, psys)) { + else if (psys_in_edit_mode(sim->eval_ctx->view_layer, psys)) { if ((pset->flag & PE_DRAW_PART)==0) skip = 1; else if (part->childtype==0 && (psys->flag & PSYS_HAIR_DYNAMICS && psys->pointcache->flag & PTCACHE_BAKED)==0) diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index abe8c8f8981..b794fcfd929 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -3509,14 +3509,14 @@ PointCache *BKE_ptcache_copy_list(ListBase *ptcaches_new, const ListBase *ptcach * every user action changing stuff, and then it runs a complete bake??? (ton) */ /* Baking */ -void BKE_ptcache_quick_cache_all(Main *bmain, Scene *scene, SceneLayer *scene_layer) +void BKE_ptcache_quick_cache_all(Main *bmain, Scene *scene, ViewLayer *view_layer) { PTCacheBaker baker; memset(&baker, 0, sizeof(baker)); baker.main = bmain; baker.scene = scene; - baker.scene_layer = scene_layer; + baker.view_layer = view_layer; baker.bake = 0; baker.render = 0; baker.anim_init = 0; @@ -3542,7 +3542,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) { Main *bmain = baker->main; Scene *scene = baker->scene; - SceneLayer *scene_layer = baker->scene_layer; + ViewLayer *view_layer = baker->view_layer; struct Depsgraph *depsgraph = baker->depsgraph; Scene *sce_iter; /* SETLOOPER macro only */ Base *base; @@ -3606,7 +3606,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) } } else { - for (SETLOOPER_SCENE_LAYER(scene, scene_layer, sce_iter, base)) { + for (SETLOOPER_VIEW_LAYER(scene, view_layer, sce_iter, base)) { /* cache/bake everything in the scene */ BKE_ptcache_ids_from_object(&pidlist, base->object, scene, MAX_DUPLI_RECUR); @@ -3662,7 +3662,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) stime = ptime = PIL_check_seconds_timer(); for (int fr = CFRA; fr <= endframe; fr += baker->quick_step, CFRA = fr) { - BKE_scene_graph_update_for_newframe(G.main->eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(G.main->eval_ctx, depsgraph, bmain, scene, view_layer); if (baker->update_progress) { float progress = ((float)(CFRA - startframe)/(float)(endframe - startframe)); @@ -3717,7 +3717,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) } } else { - for (SETLOOPER_SCENE_LAYER(scene, scene_layer, sce_iter, base)) { + for (SETLOOPER_VIEW_LAYER(scene, view_layer, sce_iter, base)) { BKE_ptcache_ids_from_object(&pidlist, base->object, scene, MAX_DUPLI_RECUR); for (pid=pidlist.first; pid; pid=pid->next) { @@ -3748,7 +3748,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) CFRA = cfrao; if (bake) { /* already on cfra unless baking */ - BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, view_layer); } /* TODO: call redraw all windows somehow */ diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index e231fd53fe3..b4e7c14e30c 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -213,7 +213,7 @@ static void layer_collections_sync_flags(ListBase *layer_collections_dst, const /* recreate the LayerCollection tree */ static void layer_collections_recreate( - SceneLayer *sl_dst, ListBase *lb_src, SceneCollection *mc_dst, SceneCollection *mc_src) + ViewLayer *sl_dst, ListBase *lb_src, SceneCollection *mc_dst, SceneCollection *mc_src) { for (LayerCollection *lc_src = lb_src->first; lc_src; lc_src = lc_src->next) { SceneCollection *sc_dst = scene_collection_from_new_tree(lc_src->scene_collection, mc_dst, mc_src); @@ -251,34 +251,34 @@ void BKE_scene_copy_data(Main *bmain, Scene *sce_dst, const Scene *sce_src, cons scene_collection_copy(mc_dst, mc_src, flag_subdata); IDPropertyTemplate val = {0}; - BLI_duplicatelist(&sce_dst->render_layers, &sce_src->render_layers); - for (SceneLayer *scene_layer_src = sce_src->render_layers.first, *scene_layer_dst = sce_dst->render_layers.first; - scene_layer_src; - scene_layer_src = scene_layer_src->next, scene_layer_dst = scene_layer_dst->next) + BLI_duplicatelist(&sce_dst->view_layers, &sce_src->view_layers); + for (ViewLayer *view_layer_src = sce_src->view_layers.first, *view_layer_dst = sce_dst->view_layers.first; + view_layer_src; + view_layer_src = view_layer_src->next, view_layer_dst = view_layer_dst->next) { - if (scene_layer_dst->id_properties != NULL) { - scene_layer_dst->id_properties = IDP_CopyProperty_ex(scene_layer_dst->id_properties, flag_subdata); + if (view_layer_dst->id_properties != NULL) { + view_layer_dst->id_properties = IDP_CopyProperty_ex(view_layer_dst->id_properties, flag_subdata); } - BKE_freestyle_config_copy(&scene_layer_dst->freestyle_config, &scene_layer_src->freestyle_config, flag_subdata); + BKE_freestyle_config_copy(&view_layer_dst->freestyle_config, &view_layer_src->freestyle_config, flag_subdata); - scene_layer_dst->stats = NULL; - scene_layer_dst->properties_evaluated = NULL; - scene_layer_dst->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); - IDP_MergeGroup_ex(scene_layer_dst->properties, scene_layer_src->properties, true, flag_subdata); + view_layer_dst->stats = NULL; + view_layer_dst->properties_evaluated = NULL; + view_layer_dst->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); + IDP_MergeGroup_ex(view_layer_dst->properties, view_layer_src->properties, true, flag_subdata); /* we start fresh with no overrides and no visibility flags set * instead of syncing both trees we simply unlink and relink the scene collection */ - BLI_listbase_clear(&scene_layer_dst->layer_collections); - BLI_listbase_clear(&scene_layer_dst->object_bases); - BLI_listbase_clear(&scene_layer_dst->drawdata); + BLI_listbase_clear(&view_layer_dst->layer_collections); + BLI_listbase_clear(&view_layer_dst->object_bases); + BLI_listbase_clear(&view_layer_dst->drawdata); - layer_collections_recreate(scene_layer_dst, &scene_layer_src->layer_collections, mc_dst, mc_src); + layer_collections_recreate(view_layer_dst, &view_layer_src->layer_collections, mc_dst, mc_src); /* Now we handle the syncing for visibility, selectability, ... */ - layer_collections_sync_flags(&scene_layer_dst->layer_collections, &scene_layer_src->layer_collections); + layer_collections_sync_flags(&view_layer_dst->layer_collections, &view_layer_src->layer_collections); - Object *active_ob = OBACT(scene_layer_src); - for (Base *base_src = scene_layer_src->object_bases.first, *base_dst = scene_layer_dst->object_bases.first; + Object *active_ob = OBACT(view_layer_src); + for (Base *base_src = view_layer_src->object_bases.first, *base_dst = view_layer_dst->object_bases.first; base_src; base_src = base_src->next, base_dst = base_dst->next) { @@ -286,7 +286,7 @@ void BKE_scene_copy_data(Main *bmain, Scene *sce_dst, const Scene *sce_src, cons base_dst->flag_legacy = base_src->flag_legacy; if (base_dst->object == active_ob) { - scene_layer_dst->basact = base_dst; + view_layer_dst->basact = base_dst; } } } @@ -410,7 +410,7 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) rv = sce_copy->r.views; curvemapping_free_data(&sce_copy->r.mblur_shutter_curve); sce_copy->r = sce->r; - sce_copy->active_layer = 0; + sce_copy->active_view_layer = 0; sce_copy->r.views = rv; sce_copy->unit = sce->unit; sce_copy->physics_settings = sce->physics_settings; @@ -508,8 +508,8 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) if (type == SCE_COPY_FULL) { /* Copy Freestyle LineStyle datablocks. */ - for (SceneLayer *scene_layer_dst = sce_copy->render_layers.first; scene_layer_dst; scene_layer_dst = scene_layer_dst->next) { - for (FreestyleLineSet *lineset = scene_layer_dst->freestyle_config.linesets.first; lineset; lineset = lineset->next) { + for (ViewLayer *view_layer_dst = sce_copy->view_layers.first; view_layer_dst; view_layer_dst = view_layer_dst->next) { + for (FreestyleLineSet *lineset = view_layer_dst->freestyle_config.linesets.first; lineset; lineset = lineset->next) { if (lineset->linestyle) { /* XXX Not copying anim/actions here? */ BKE_id_copy_ex(bmain, (ID *)lineset->linestyle, (ID **)&lineset->linestyle, 0, false); @@ -641,11 +641,11 @@ void BKE_scene_free_ex(Scene *sce, const bool do_id_user) BKE_previewimg_free(&sce->preview); curvemapping_free_data(&sce->r.mblur_shutter_curve); - for (SceneLayer *sl = sce->render_layers.first, *sl_next; sl; sl = sl_next) { + for (ViewLayer *sl = sce->view_layers.first, *sl_next; sl; sl = sl_next) { sl_next = sl->next; - BLI_remlink(&sce->render_layers, sl); - BKE_scene_layer_free(sl); + BLI_remlink(&sce->view_layers, sl); + BKE_view_layer_free(sl); } /* Master Collection */ @@ -1030,9 +1030,9 @@ void BKE_scene_init(Scene *sce) BKE_layer_collection_engine_settings_create(sce->collection_properties); sce->layer_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); - BKE_scene_layer_engine_settings_create(sce->layer_properties); + BKE_view_layer_engine_settings_create(sce->layer_properties); - BKE_scene_layer_add(sce, "Render Layer"); + BKE_view_layer_add(sce, "Render Layer"); } Scene *BKE_scene_add(Main *bmain, const char *name) @@ -1053,8 +1053,8 @@ Scene *BKE_scene_add(Main *bmain, const char *name) */ bool BKE_scene_object_find(Scene *scene, Object *ob) { - for (SceneLayer *scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - if (BLI_findptr(&scene_layer->object_bases, ob, offsetof(Base, object))) { + for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + if (BLI_findptr(&view_layer->object_bases, ob, offsetof(Base, object))) { return true; } } @@ -1063,8 +1063,8 @@ bool BKE_scene_object_find(Scene *scene, Object *ob) Object *BKE_scene_object_find_by_name(Scene *scene, const char *name) { - for (SceneLayer *scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { if (STREQ(base->object->id.name + 2, name)) { return base->object; } @@ -1105,8 +1105,8 @@ void BKE_scene_set_background(Main *bmain, Scene *scene) } /* copy layers and flags from bases to objects */ - for (SceneLayer *scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { ob = base->object; /* group patch... */ BKE_scene_object_base_flag_sync_from_base(base); @@ -1150,8 +1150,8 @@ int BKE_scene_base_iter_next( /* the first base */ if (iter->phase == F_START) { - SceneLayer *scene_layer = eval_ctx->scene_layer; - *base = scene_layer->object_bases.first; + ViewLayer *view_layer = eval_ctx->view_layer; + *base = view_layer->object_bases.first; if (*base) { *ob = (*base)->object; iter->phase = F_SCENE; @@ -1160,9 +1160,9 @@ int BKE_scene_base_iter_next( /* exception: empty scene layer */ while ((*scene)->set) { (*scene) = (*scene)->set; - SceneLayer *scene_layer_set = BKE_scene_layer_from_scene_get((*scene)); - if (scene_layer_set->object_bases.first) { - *base = scene_layer_set->object_bases.first; + ViewLayer *view_layer_set = BKE_view_layer_from_scene_get((*scene)); + if (view_layer_set->object_bases.first) { + *base = view_layer_set->object_bases.first; *ob = (*base)->object; iter->phase = F_SCENE; break; @@ -1181,9 +1181,9 @@ int BKE_scene_base_iter_next( /* (*scene) is finished, now do the set */ while ((*scene)->set) { (*scene) = (*scene)->set; - SceneLayer *scene_layer_set = BKE_scene_layer_from_scene_get((*scene)); - if (scene_layer_set->object_bases.first) { - *base = scene_layer_set->object_bases.first; + ViewLayer *view_layer_set = BKE_view_layer_from_scene_get((*scene)); + if (view_layer_set->object_bases.first) { + *base = view_layer_set->object_bases.first; *ob = (*base)->object; break; } @@ -1264,8 +1264,8 @@ int BKE_scene_base_iter_next( Scene *BKE_scene_find_from_collection(const Main *bmain, const SceneCollection *scene_collection) { for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { - for (SceneLayer *layer = scene->render_layers.first; layer; layer = layer->next) { - if (BKE_scene_layer_has_collection(layer, scene_collection)) { + for (ViewLayer *layer = scene->view_layers.first; layer; layer = layer->next) { + if (BKE_view_layer_has_collection(layer, scene_collection)) { return scene; } } @@ -1509,25 +1509,25 @@ static void prepare_mesh_for_viewport_render(Main *bmain, Scene *scene) } } -/* TODO(sergey): This actually should become scene_layer_graph or so. +/* TODO(sergey): This actually should become view_layer_graph or so. * Same applies to update_for_newframe. */ void BKE_scene_graph_update_tagged(EvaluationContext *eval_ctx, Depsgraph *depsgraph, Main *bmain, Scene *scene, - SceneLayer *scene_layer) + ViewLayer *view_layer) { /* TODO(sergey): Temporary solution for until pipeline.c is ported. */ - if (scene_layer == NULL) { - scene_layer = DEG_get_evaluated_scene_layer(depsgraph); - BLI_assert(scene_layer != NULL); + if (view_layer == NULL) { + view_layer = DEG_get_evaluated_view_layer(depsgraph); + BLI_assert(view_layer != NULL); } /* TODO(sergey): Some functions here are changing global state, * for example, clearing update tags from bmain. */ /* (Re-)build dependency graph if needed. */ - DEG_graph_relations_update(depsgraph, bmain, scene, scene_layer); + DEG_graph_relations_update(depsgraph, bmain, scene, view_layer); /* Uncomment this to check if graph was properly tagged for update. */ // DEG_debug_graph_relations_validate(depsgraph, bmain, scene); /* Flush editing data if needed. */ @@ -1551,12 +1551,12 @@ void BKE_scene_graph_update_for_newframe(EvaluationContext *eval_ctx, Depsgraph *depsgraph, Main *bmain, Scene *scene, - SceneLayer *scene_layer) + ViewLayer *view_layer) { /* TODO(sergey): Temporary solution for until pipeline.c is ported. */ - if (scene_layer == NULL) { - scene_layer = DEG_get_evaluated_scene_layer(depsgraph); - BLI_assert(scene_layer != NULL); + if (view_layer == NULL) { + view_layer = DEG_get_evaluated_view_layer(depsgraph); + BLI_assert(view_layer != NULL); } /* TODO(sergey): Some functions here are changing global state, * for example, clearing update tags from bmain. @@ -1573,7 +1573,7 @@ void BKE_scene_graph_update_for_newframe(EvaluationContext *eval_ctx, */ BKE_image_update_frame(bmain, scene->r.cfra); BKE_sound_set_cfra(scene->r.cfra); - DEG_graph_relations_update(depsgraph, bmain, scene, scene_layer); + DEG_graph_relations_update(depsgraph, bmain, scene, view_layer); /* Update animated cache files for modifiers. * * TODO(sergey): Make this a depsgraph node? @@ -1678,22 +1678,22 @@ float get_render_aosss_error(const RenderData *r, float error) } /** - * Helper function for the SETLOOPER and SETLOOPER_SCENE_LAYER macros + * Helper function for the SETLOOPER and SETLOOPER_VIEW_LAYER macros * * It iterates over the bases of the active layer and then the bases * of the active layer of the background (set) scenes recursively. */ -Base *_setlooper_base_step(Scene **sce_iter, SceneLayer *scene_layer, Base *base) +Base *_setlooper_base_step(Scene **sce_iter, ViewLayer *view_layer, Base *base) { if (base && base->next) { /* Common case, step to the next. */ return base->next; } - else if ((base == NULL) && (scene_layer != NULL)) { + else if ((base == NULL) && (view_layer != NULL)) { /* First time looping, return the scenes first base. */ /* For the first loop we should get the layer from workspace when available. */ - if (scene_layer->object_bases.first) { - return (Base *)scene_layer->object_bases.first; + if (view_layer->object_bases.first) { + return (Base *)view_layer->object_bases.first; } /* No base on this scene layer. */ goto next_set; @@ -1702,8 +1702,8 @@ Base *_setlooper_base_step(Scene **sce_iter, SceneLayer *scene_layer, Base *base next_set: /* Reached the end, get the next base in the set. */ while ((*sce_iter = (*sce_iter)->set)) { - SceneLayer *scene_layer_set = BKE_scene_layer_from_scene_get((*sce_iter)); - base = (Base *)scene_layer_set->object_bases.first; + ViewLayer *view_layer_set = BKE_view_layer_from_scene_get((*sce_iter)); + base = (Base *)view_layer_set->object_bases.first; if (base) { return base; @@ -1751,9 +1751,9 @@ bool BKE_scene_uses_blender_eevee(const Scene *scene) return BKE_viewrender_uses_blender_eevee(&scene->view_render); } -void BKE_scene_base_flag_to_objects(SceneLayer *scene_layer) +void BKE_scene_base_flag_to_objects(ViewLayer *view_layer) { - Base *base = scene_layer->object_bases.first; + Base *base = view_layer->object_bases.first; while (base) { BKE_scene_object_base_flag_sync_from_base(base); @@ -2238,7 +2238,7 @@ int BKE_scene_multiview_num_videos_get(const RenderData *rd) /* This is a key which identifies depsgraph. */ typedef struct DepsgraphKey { - SceneLayer *scene_layer; + ViewLayer *view_layer; /* TODO(sergey): Need to include window somehow (same layer might be in a * different states in different windows). */ @@ -2247,7 +2247,7 @@ typedef struct DepsgraphKey { static unsigned int depsgraph_key_hash(const void *key_v) { const DepsgraphKey *key = key_v; - unsigned int hash = BLI_ghashutil_ptrhash(key->scene_layer); + unsigned int hash = BLI_ghashutil_ptrhash(key->view_layer); /* TODO(sergey): Include hash from other fields in the key. */ return hash; } @@ -2257,7 +2257,7 @@ static bool depsgraph_key_compare(const void *key_a_v, const void *key_b_v) const DepsgraphKey *key_a = key_a_v; const DepsgraphKey *key_b = key_b_v; /* TODO(sergey): Compare rest of */ - return !(key_a->scene_layer == key_b->scene_layer); + return !(key_a->view_layer == key_b->view_layer); } static void depsgraph_key_free(void *key_v) @@ -2299,11 +2299,11 @@ void BKE_scene_free_depsgraph_hash(Scene *scene) /* Query depsgraph for a specific contexts. */ Depsgraph *BKE_scene_get_depsgraph(Scene *scene, - SceneLayer *scene_layer, + ViewLayer *view_layer, bool allocate) { BLI_assert(scene != NULL); - BLI_assert(scene_layer != NULL); + BLI_assert(view_layer != NULL); /* Make sure hash itself exists. */ if (allocate) { BKE_scene_ensure_depsgraph_hash(scene); @@ -2315,7 +2315,7 @@ Depsgraph *BKE_scene_get_depsgraph(Scene *scene, * depending on whether caller wants us to create depsgraph or not. */ DepsgraphKey key; - key.scene_layer = scene_layer; + key.view_layer = view_layer; Depsgraph *depsgraph; if (allocate) { DepsgraphKey **key_ptr; diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 3e1ebc2a057..a83eba145c9 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -3263,8 +3263,8 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq have_comp = (scene->r.scemode & R_DOCOMP) && scene->use_nodes && scene->nodetree; /* Get depsgraph and scene layer for the strip. */ - SceneLayer *scene_layer = BKE_scene_layer_from_scene_get(scene); - Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, scene_layer, true); + ViewLayer *view_layer = BKE_view_layer_from_scene_get(scene); + Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true); orig_data.scemode = scene->r.scemode; orig_data.cfra = scene->r.cfra; @@ -3315,10 +3315,10 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq /* opengl offscreen render */ context->eval_ctx->engine = RE_engines_find(scene->view_render.engine_id); - BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, view_layer); ibuf = sequencer_view3d_cb( /* set for OpenGL render (NULL when scrubbing) */ - context->eval_ctx, scene, scene_layer, camera, width, height, IB_rect, + context->eval_ctx, scene, view_layer, camera, width, height, IB_rect, context->scene->r.seq_prev_type, (context->scene->r.seq_flag & R_SEQ_SOLID_TEX) != 0, use_gpencil, use_background, scene->r.alphamode, @@ -3355,7 +3355,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq RE_SetDepsgraph(re, depsgraph); DEG_graph_id_tag_update(context->bmain, depsgraph, &scene->id, 0); - BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, view_layer); RE_BlenderFrame(re, context->bmain, scene, NULL, camera, scene->lay, frame, false); /* restore previous state after it was toggled on & off by RE_BlenderFrame */ @@ -3415,7 +3415,7 @@ finally: scene->r.subframe = orig_data.subframe; if (is_frame_update) { - BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, view_layer); } #ifdef DURIAN_CAMERA_SWITCH diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 4483914f1a6..33da3623481 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -695,10 +695,10 @@ void smokeModifier_copy(struct SmokeModifierData *smd, struct SmokeModifierData #ifdef WITH_SMOKE // forward decleration -static void smoke_calc_transparency(SmokeDomainSettings *sds, SceneLayer *sl); +static void smoke_calc_transparency(SmokeDomainSettings *sds, ViewLayer *sl); static float calc_voxel_transp(float *result, float *input, int res[3], int *pixel, float *tRay, float correct); -static int get_lamp(SceneLayer *sl, float *light) +static int get_lamp(ViewLayer *sl, float *light) { Base *base_tmp = NULL; int found_lamp = 0; @@ -2811,7 +2811,7 @@ static void smokeModifier_process( } // create shadows before writing cache so they get stored - smoke_calc_transparency(sds, eval_ctx->scene_layer); + smoke_calc_transparency(sds, eval_ctx->view_layer); if (sds->wt && sds->total_cells > 1) { smoke_turbulence_step(sds->wt, sds->fluid); @@ -2950,7 +2950,7 @@ static void bresenham_linie_3D(int x1, int y1, int z1, int x2, int y2, int z2, f cb(result, input, res, pixel, tRay, correct); } -static void smoke_calc_transparency(SmokeDomainSettings *sds, SceneLayer *sl) +static void smoke_calc_transparency(SmokeDomainSettings *sds, ViewLayer *sl) { float bv[6] = {0}; float light[3]; diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 4d974a1bbd5..1f69fca07fe 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -514,7 +514,7 @@ static void ccd_build_deflector_hash_single(GHash *hash, Object *ob) /** * \note group overrides scene when not NULL. */ -static void ccd_build_deflector_hash(SceneLayer *sl, Group *group, Object *vertexowner, GHash *hash) +static void ccd_build_deflector_hash(ViewLayer *sl, Group *group, Object *vertexowner, GHash *hash) { Object *ob; @@ -560,7 +560,7 @@ static void ccd_update_deflector_hash_single(GHash *hash, Object *ob) /** * \note group overrides scene when not NULL. */ -static void ccd_update_deflector_hash(SceneLayer *sl, Group *group, Object *vertexowner, GHash *hash) +static void ccd_update_deflector_hash(ViewLayer *sl, Group *group, Object *vertexowner, GHash *hash) { Object *ob; @@ -979,7 +979,7 @@ static void free_softbody_intern(SoftBody *sb) /** * \note group overrides scene when not NULL. */ -static bool are_there_deflectors(SceneLayer *sl, Group *group) +static bool are_there_deflectors(ViewLayer *sl, Group *group) { if (group) { for (GroupObject *go = group->gobject.first; go; go = go->next) { @@ -999,7 +999,7 @@ static bool are_there_deflectors(SceneLayer *sl, Group *group) return 0; } -static int query_external_colliders(SceneLayer *sl, Group *group) +static int query_external_colliders(ViewLayer *sl, Group *group) { return(are_there_deflectors(sl, group)); } @@ -2251,7 +2251,7 @@ static void softbody_calc_forcesEx(const struct EvaluationContext *eval_ctx, Sce /* gravity = sb->grav * sb_grav_force_scale(ob); */ /* UNUSED */ /* check conditions for various options */ - do_deflector= query_external_colliders(eval_ctx->scene_layer, sb->collision_group); + do_deflector= query_external_colliders(eval_ctx->view_layer, sb->collision_group); /* do_selfcollision=((ob->softflag & OB_SB_EDGES) && (sb->bspring)&& (ob->softflag & OB_SB_SELF)); */ /* UNUSED */ do_springcollision=do_deflector && (ob->softflag & OB_SB_EDGES) &&(ob->softflag & OB_SB_EDGECOLL); do_aero=((sb->aeroedge)&& (ob->softflag & OB_SB_EDGES)); @@ -2315,7 +2315,7 @@ static void softbody_calc_forces(const struct EvaluationContext *eval_ctx, Scene } /* check conditions for various options */ - do_deflector= query_external_colliders(eval_ctx->scene_layer, sb->collision_group); + do_deflector= query_external_colliders(eval_ctx->view_layer, sb->collision_group); do_selfcollision=((ob->softflag & OB_SB_EDGES) && (sb->bspring)&& (ob->softflag & OB_SB_SELF)); do_springcollision=do_deflector && (ob->softflag & OB_SB_EDGES) &&(ob->softflag & OB_SB_EDGECOLL); do_aero=((sb->aeroedge)&& (ob->softflag & OB_SB_EDGES)); @@ -3526,11 +3526,11 @@ static void softbody_step(const struct EvaluationContext *eval_ctx, Scene *scene */ if (dtime < 0 || dtime > 10.5f) return; - ccd_update_deflector_hash(eval_ctx->scene_layer, sb->collision_group, ob, sb->scratch->colliderhash); + ccd_update_deflector_hash(eval_ctx->view_layer, sb->collision_group, ob, sb->scratch->colliderhash); if (sb->scratch->needstobuildcollider) { - if (query_external_colliders(eval_ctx->scene_layer, sb->collision_group)) { - ccd_build_deflector_hash(eval_ctx->scene_layer, sb->collision_group, ob, sb->scratch->colliderhash); + if (query_external_colliders(eval_ctx->view_layer, sb->collision_group)) { + ccd_build_deflector_hash(eval_ctx->view_layer, sb->collision_group, ob, sb->scratch->colliderhash); } sb->scratch->needstobuildcollider=0; } diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 6cf310461c1..747ffdafe8b 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -886,8 +886,8 @@ void BKE_sound_update_scene(Main *bmain, Scene *scene) if (!BLI_listbase_is_empty(&bmain->speaker)) { BKE_main_id_tag_listbase(&bmain->object, LIB_TAG_DOIT, true); - for (SceneLayer *scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - for (base = scene_layer->object_bases.first; base; base = base->next) { + for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + for (base = view_layer->object_bases.first; base; base = base->next) { sound_update_base(scene, base, new_set); } } diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 6ebd8e6ae36..07e071df04a 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -401,7 +401,7 @@ void BKE_tracking_get_camera_object_matrix(Scene *scene, Object *ob, float mat[4 if (scene->camera) ob = scene->camera; else - ob = BKE_scene_layer_camera_find(BKE_scene_layer_from_scene_get(scene)); + ob = BKE_view_layer_camera_find(BKE_view_layer_from_scene_get(scene)); } if (ob) diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c index fec9d736e09..67639b4c7ab 100644 --- a/source/blender/blenkernel/intern/workspace.c +++ b/source/blender/blenkernel/intern/workspace.c @@ -401,13 +401,13 @@ ListBase *BKE_workspace_transform_orientations_get(WorkSpace *workspace) return &workspace->transform_orientations; } -SceneLayer *BKE_workspace_render_layer_get(const WorkSpace *workspace) +ViewLayer *BKE_workspace_view_layer_get(const WorkSpace *workspace) { - return workspace->render_layer; + return workspace->view_layer; } -void BKE_workspace_render_layer_set(WorkSpace *workspace, SceneLayer *layer) +void BKE_workspace_view_layer_set(WorkSpace *workspace, ViewLayer *layer) { - workspace->render_layer = layer; + workspace->view_layer = layer; } ListBase *BKE_workspace_layouts_get(WorkSpace *workspace) @@ -477,9 +477,9 @@ void BKE_workspace_update_tagged(struct EvaluationContext *eval_ctx, WorkSpace *workspace, Scene *scene) { - SceneLayer *scene_layer = BKE_workspace_render_layer_get(workspace); + ViewLayer *view_layer = BKE_workspace_view_layer_get(workspace); struct Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, - scene_layer, + view_layer, true); - BKE_scene_graph_update_tagged(eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_tagged(eval_ctx, depsgraph, bmain, scene, view_layer); } diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h index 676d3a7bcca..00d00e98c84 100644 --- a/source/blender/blenloader/BLO_readfile.h +++ b/source/blender/blenloader/BLO_readfile.h @@ -44,7 +44,7 @@ struct Main; struct MemFile; struct ReportList; struct Scene; -struct SceneLayer; +struct ViewLayer; struct UserDef; struct View3D; struct bContext; @@ -70,7 +70,7 @@ typedef struct BlendFileData { struct bScreen *curscreen; /* TODO think this isn't needed anymore? */ struct Scene *curscene; - struct SceneLayer *cur_render_layer; /* layer to activate in workspaces when reading without UI */ + struct ViewLayer *cur_view_layer; /* layer to activate in workspaces when reading without UI */ eBlenFileType type; } BlendFileData; @@ -124,9 +124,9 @@ struct ID *BLO_library_link_named_part(struct Main *mainl, BlendHandle **bh, con struct ID *BLO_library_link_named_part_ex( struct Main *mainl, BlendHandle **bh, const short idcode, const char *name, const short flag, - struct Scene *scene, struct SceneLayer *scene_layer, + struct Scene *scene, struct ViewLayer *view_layer, const bool use_placeholders, const bool force_indirect); -void BLO_library_link_end(struct Main *mainl, BlendHandle **bh, short flag, struct Scene *scene, struct SceneLayer *scene_layer); +void BLO_library_link_end(struct Main *mainl, BlendHandle **bh, short flag, struct Scene *scene, struct ViewLayer *view_layer); void BLO_library_link_copypaste(struct Main *mainl, BlendHandle *bh); @@ -137,7 +137,7 @@ BlendFileData *blo_read_blendafterruntime(int file, const char *name, int actual /* internal function but we need to expose it */ void blo_lib_link_restore( struct Main *newmain, struct wmWindowManager *curwm, - struct Scene *curscene, struct SceneLayer *cur_render_layer); + struct Scene *curscene, struct ViewLayer *cur_render_layer); typedef void (*BLOExpandDoitCallback) (void *fdhandle, struct Main *mainvar, void *idv); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 5cc58ff5843..065e0871a3d 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -252,7 +252,7 @@ static void *read_struct(FileData *fd, BHead *bh, const char *blockname); static void direct_link_modifiers(FileData *fd, ListBase *lb); static BHead *find_bhead_from_code_name(FileData *fd, const short idcode, const char *name); static BHead *find_bhead_from_idname(FileData *fd, const char *idname); -static SceneCollection *get_scene_collection_active_or_create(struct Scene *scene, struct SceneLayer *scene_layer, const short flag); +static SceneCollection *get_scene_collection_active_or_create(struct Scene *scene, struct ViewLayer *view_layer, const short flag); /* this function ensures that reports are printed, * in the case of libraray linking errors this is important! @@ -2838,7 +2838,7 @@ static void direct_link_workspace(FileData *fd, WorkSpace *workspace, const Main if (ID_IS_LINKED(&workspace->id)) { /* Appending workspace so render layer is likely from a different scene. Unset * now, when activating workspace later we set a valid one from current scene. */ - BKE_workspace_render_layer_set(workspace, NULL); + BKE_workspace_view_layer_set(workspace, NULL); } /* Same issue/fix as in direct_link_workspace_link_scene_data: Can't read workspace data @@ -5932,20 +5932,20 @@ static void lib_link_scene(FileData *fd, Main *main) lib_link_scene_collection(fd, sce->id.lib, sce->collection); - for (SceneLayer *scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next) { + for (ViewLayer *view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) { /* tag scene layer to update for collection tree evaluation */ - scene_layer->flag |= SCENE_LAYER_ENGINE_DIRTY; + view_layer->flag |= VIEW_LAYER_ENGINE_DIRTY; - for (FreestyleModuleConfig *fmc = scene_layer->freestyle_config.modules.first; fmc; fmc = fmc->next) { + for (FreestyleModuleConfig *fmc = view_layer->freestyle_config.modules.first; fmc; fmc = fmc->next) { fmc->script = newlibadr(fd, sce->id.lib, fmc->script); } - for (FreestyleLineSet *fls = scene_layer->freestyle_config.linesets.first; fls; fls = fls->next) { + for (FreestyleLineSet *fls = view_layer->freestyle_config.linesets.first; fls; fls = fls->next) { fls->linestyle = newlibadr_us(fd, sce->id.lib, fls->linestyle); fls->group = newlibadr_us(fd, sce->id.lib, fls->group); } - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { /* we only bump the use count for the collection objects */ base->object = newlibadr(fd, sce->id.lib, base->object); base->flag |= BASE_DIRTY_ENGINE_SETTINGS; @@ -6099,10 +6099,10 @@ static void direct_link_workspace_link_scene_data( FileData *fd, const Scene *scene, const ListBase *workspaces) { for (WorkSpace *workspace = workspaces->first; workspace; workspace = workspace->id.next) { - SceneLayer *layer = newdataadr(fd, BKE_workspace_render_layer_get(workspace)); + ViewLayer *layer = newdataadr(fd, BKE_workspace_view_layer_get(workspace)); /* only set when layer is from the scene we read */ - if (layer && (BLI_findindex(&scene->render_layers, layer) != -1)) { - BKE_workspace_render_layer_set(workspace, layer); + if (layer && (BLI_findindex(&scene->view_layers, layer) != -1)) { + BKE_workspace_view_layer_set(workspace, layer); } } } @@ -6113,7 +6113,7 @@ static void direct_link_scene(FileData *fd, Scene *sce, Main *bmain) Sequence *seq; MetaStack *ms; RigidBodyWorld *rbw; - SceneLayer *scene_layer; + ViewLayer *view_layer; SceneRenderLayer *srl; sce->depsgraph_hash = NULL; @@ -6149,7 +6149,7 @@ static void direct_link_scene(FileData *fd, Scene *sce, Main *bmain) sce->toolsettings->imapaint.paintcursor = NULL; sce->toolsettings->particle.paintcursor = NULL; sce->toolsettings->particle.scene = NULL; - sce->toolsettings->particle.scene_layer = NULL; + sce->toolsettings->particle.view_layer = NULL; sce->toolsettings->particle.object = NULL; sce->toolsettings->gp_sculpt.paintcursor = NULL; @@ -6361,29 +6361,29 @@ static void direct_link_scene(FileData *fd, Scene *sce, Main *bmain) } /* insert into global old-new map for reading without UI (link_global accesses it again) */ - link_glob_list(fd, &sce->render_layers); - for (scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - scene_layer->stats = NULL; - link_list(fd, &scene_layer->object_bases); - scene_layer->basact = newdataadr(fd, scene_layer->basact); - direct_link_layer_collections(fd, &scene_layer->layer_collections); + link_glob_list(fd, &sce->view_layers); + for (view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) { + view_layer->stats = NULL; + link_list(fd, &view_layer->object_bases); + view_layer->basact = newdataadr(fd, view_layer->basact); + direct_link_layer_collections(fd, &view_layer->layer_collections); - if (scene_layer->properties != NULL) { - scene_layer->properties = newdataadr(fd, scene_layer->properties); - BLI_assert(scene_layer->properties != NULL); - IDP_DirectLinkGroup_OrFree(&scene_layer->properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd); - BKE_scene_layer_engine_settings_validate_layer(scene_layer); + if (view_layer->properties != NULL) { + view_layer->properties = newdataadr(fd, view_layer->properties); + BLI_assert(view_layer->properties != NULL); + IDP_DirectLinkGroup_OrFree(&view_layer->properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd); + BKE_view_layer_engine_settings_validate_layer(view_layer); } - scene_layer->id_properties = newdataadr(fd, scene_layer->id_properties); - IDP_DirectLinkGroup_OrFree(&scene_layer->id_properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd); + view_layer->id_properties = newdataadr(fd, view_layer->id_properties); + IDP_DirectLinkGroup_OrFree(&view_layer->id_properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd); - link_list(fd, &(scene_layer->freestyle_config.modules)); - link_list(fd, &(scene_layer->freestyle_config.linesets)); + link_list(fd, &(view_layer->freestyle_config.modules)); + link_list(fd, &(view_layer->freestyle_config.linesets)); - scene_layer->properties_evaluated = NULL; + view_layer->properties_evaluated = NULL; - BLI_listbase_clear(&scene_layer->drawdata); + BLI_listbase_clear(&view_layer->drawdata); } sce->collection_properties = newdataadr(fd, sce->collection_properties); @@ -6393,7 +6393,7 @@ static void direct_link_scene(FileData *fd, Scene *sce, Main *bmain) IDP_DirectLinkGroup_OrFree(&sce->layer_properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd); BKE_layer_collection_engine_settings_validate_scene(sce); - BKE_scene_layer_engine_settings_validate_scene(sce); + BKE_view_layer_engine_settings_validate_scene(sce); direct_link_workspace_link_scene_data(fd, sce, &bmain->workspaces); } @@ -7127,7 +7127,7 @@ static void lib_link_workspace_layout_restore(struct IDNameLib_Map *id_map, Main * Used to link a file (without UI) to the current UI. * Note that it assumes the old pointers in UI are still valid, so old Main is not freed. */ -void blo_lib_link_restore(Main *newmain, wmWindowManager *curwm, Scene *curscene, SceneLayer *cur_render_layer) +void blo_lib_link_restore(Main *newmain, wmWindowManager *curwm, Scene *curscene, ViewLayer *cur_view_layer) { struct IDNameLib_Map *id_map = BKE_main_idmap_create(newmain); @@ -7137,7 +7137,7 @@ void blo_lib_link_restore(Main *newmain, wmWindowManager *curwm, Scene *curscene for (WorkSpaceLayout *layout = layouts->first; layout; layout = layout->next) { lib_link_workspace_layout_restore(id_map, newmain, layout); } - BKE_workspace_render_layer_set(workspace, cur_render_layer); + BKE_workspace_view_layer_set(workspace, cur_view_layer); } for (wmWindow *win = curwm->windows.first; win; win = win->next) { @@ -8587,7 +8587,7 @@ static BHead *read_global(BlendFileData *bfd, FileData *fd, BHead *bhead) bfd->curscreen = fg->curscreen; bfd->curscene = fg->curscene; - bfd->cur_render_layer = fg->cur_render_layer; + bfd->cur_view_layer = fg->cur_view_layer; MEM_freeN(fg); @@ -8600,7 +8600,7 @@ static BHead *read_global(BlendFileData *bfd, FileData *fd, BHead *bhead) /* note, this has to be kept for reading older files... */ static void link_global(FileData *fd, BlendFileData *bfd) { - bfd->cur_render_layer = newglobadr(fd, bfd->cur_render_layer); + bfd->cur_view_layer = newglobadr(fd, bfd->cur_view_layer); bfd->curscreen = newlibadr(fd, NULL, bfd->curscreen); bfd->curscene = newlibadr(fd, NULL, bfd->curscene); // this happens in files older than 2.35 @@ -9823,14 +9823,14 @@ static void expand_scene(FileData *fd, Main *mainvar, Scene *sce) } } - for (SceneLayer *scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - for (module = scene_layer->freestyle_config.modules.first; module; module = module->next) { + for (ViewLayer *view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) { + for (module = view_layer->freestyle_config.modules.first; module; module = module->next) { if (module->script) { expand_doit(fd, mainvar, module->script); } } - for (lineset = scene_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) { + for (lineset = view_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) { if (lineset->group) { expand_doit(fd, mainvar, lineset->group); } @@ -10142,7 +10142,7 @@ static bool object_in_any_scene(Main *mainvar, Object *ob) } static void give_base_to_objects( - Main *mainvar, Scene *scene, SceneLayer *scene_layer, Library *lib, const short flag) + Main *mainvar, Scene *scene, ViewLayer *view_layer, Library *lib, const short flag) { Object *ob; Base *base; @@ -10169,11 +10169,11 @@ static void give_base_to_objects( CLAMP_MIN(ob->id.us, 0); if (scene_collection == NULL) { - scene_collection = get_scene_collection_active_or_create(scene, scene_layer, FILE_ACTIVE_COLLECTION); + scene_collection = get_scene_collection_active_or_create(scene, view_layer, FILE_ACTIVE_COLLECTION); } BKE_collection_object_add(scene, scene_collection, ob); - base = BKE_scene_layer_base_find(scene_layer, ob); + base = BKE_view_layer_base_find(view_layer, ob); BKE_scene_object_base_flag_sync_from_base(base); if (flag & FILE_AUTOSELECT) { @@ -10194,7 +10194,7 @@ static void give_base_to_objects( } static void give_base_to_groups( - Main *mainvar, Scene *scene, SceneLayer *scene_layer, Library *UNUSED(lib), const short UNUSED(flag)) + Main *mainvar, Scene *scene, ViewLayer *view_layer, Library *UNUSED(lib), const short UNUSED(flag)) { Group *group; Base *base; @@ -10202,7 +10202,7 @@ static void give_base_to_groups( SceneCollection *scene_collection; /* If the group is empty this function is not even called, so it's safe to ensure a collection at this point. */ - scene_collection = get_scene_collection_active_or_create(scene, scene_layer, FILE_ACTIVE_COLLECTION); + scene_collection = get_scene_collection_active_or_create(scene, view_layer, FILE_ACTIVE_COLLECTION); /* Give all objects which are tagged a base. */ for (group = mainvar->group.first; group; group = group->id.next) { @@ -10215,7 +10215,7 @@ static void give_base_to_groups( ob->type = OB_EMPTY; BKE_collection_object_add(scene, scene_collection, ob); - base = BKE_scene_layer_base_find(scene_layer, ob); + base = BKE_view_layer_base_find(view_layer, ob); if (base->flag & BASE_SELECTABLED) { base->flag |= BASE_SELECTED; @@ -10223,7 +10223,7 @@ static void give_base_to_groups( BKE_scene_object_base_flag_sync_from_base(base); DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); - scene_layer->basact = base; + view_layer->basact = base; /* Assign the group. */ ob->dup_group = group; @@ -10300,22 +10300,22 @@ static ID *link_named_part( return id; } -static SceneCollection *get_scene_collection_active_or_create(struct Scene *scene, struct SceneLayer *scene_layer, const short flag) +static SceneCollection *get_scene_collection_active_or_create(struct Scene *scene, struct ViewLayer *view_layer, const short flag) { LayerCollection *lc = NULL; if (flag & FILE_ACTIVE_COLLECTION) { - lc = BKE_layer_collection_get_active_ensure(scene, scene_layer); + lc = BKE_layer_collection_get_active_ensure(scene, view_layer); } else { SceneCollection *sc = BKE_collection_add(scene, NULL, NULL); - lc = BKE_collection_link(scene_layer, sc); + lc = BKE_collection_link(view_layer, sc); } return lc->scene_collection; } -static void link_object_postprocess(ID *id, Scene *scene, SceneLayer *scene_layer, const short flag) +static void link_object_postprocess(ID *id, Scene *scene, ViewLayer *view_layer, const short flag) { if (scene) { /* link to scene */ @@ -10326,9 +10326,9 @@ static void link_object_postprocess(ID *id, Scene *scene, SceneLayer *scene_laye ob = (Object *)id; ob->mode = OB_MODE_OBJECT; - sc = get_scene_collection_active_or_create(scene, scene_layer, flag); + sc = get_scene_collection_active_or_create(scene, view_layer, flag); BKE_collection_object_add(scene, sc, ob); - base = BKE_scene_layer_base_find(scene_layer, ob); + base = BKE_view_layer_base_find(view_layer, ob); BKE_scene_object_base_flag_sync_from_base(base); if (flag & FILE_AUTOSELECT) { @@ -10378,12 +10378,12 @@ void BLO_library_link_copypaste(Main *mainl, BlendHandle *bh) static ID *link_named_part_ex( Main *mainl, FileData *fd, const short idcode, const char *name, const short flag, - Scene *scene, SceneLayer *scene_layer, const bool use_placeholders, const bool force_indirect) + Scene *scene, ViewLayer *view_layer, const bool use_placeholders, const bool force_indirect) { ID *id = link_named_part(mainl, fd, idcode, name, use_placeholders, force_indirect); if (id && (GS(id->name) == ID_OB)) { /* loose object: give a base */ - link_object_postprocess(id, scene, scene_layer, flag); + link_object_postprocess(id, scene, view_layer, flag); } else if (id && (GS(id->name) == ID_GR)) { /* tag as needing to be instantiated */ @@ -10427,11 +10427,11 @@ ID *BLO_library_link_named_part(Main *mainl, BlendHandle **bh, const short idcod ID *BLO_library_link_named_part_ex( Main *mainl, BlendHandle **bh, const short idcode, const char *name, const short flag, - Scene *scene, SceneLayer *scene_layer, + Scene *scene, ViewLayer *view_layer, const bool use_placeholders, const bool force_indirect) { FileData *fd = (FileData*)(*bh); - return link_named_part_ex(mainl, fd, idcode, name, flag, scene, scene_layer, use_placeholders, force_indirect); + return link_named_part_ex(mainl, fd, idcode, name, flag, scene, view_layer, use_placeholders, force_indirect); } static void link_id_part(ReportList *reports, FileData *fd, Main *mainvar, ID *id, ID **r_id) @@ -10544,7 +10544,7 @@ static void split_main_newid(Main *mainptr, Main *main_newid) } /* scene and v3d may be NULL. */ -static void library_link_end(Main *mainl, FileData **fd, const short flag, Scene *scene, SceneLayer *scene_layer) +static void library_link_end(Main *mainl, FileData **fd, const short flag, Scene *scene, ViewLayer *view_layer) { Main *mainvar; Library *curlib; @@ -10600,10 +10600,10 @@ static void library_link_end(Main *mainl, FileData **fd, const short flag, Scene * Only directly linked objects & groups are instantiated by `BLO_library_link_named_part_ex()` & co, * here we handle indirect ones and other possible edge-cases. */ if (scene) { - give_base_to_objects(mainvar, scene, scene_layer, curlib, flag); + give_base_to_objects(mainvar, scene, view_layer, curlib, flag); if (flag & FILE_GROUP_INSTANCE) { - give_base_to_groups(mainvar, scene, scene_layer, curlib, flag); + give_base_to_groups(mainvar, scene, view_layer, curlib, flag); } } else { @@ -10629,12 +10629,12 @@ static void library_link_end(Main *mainl, FileData **fd, const short flag, Scene * \param bh The blender file handle (WARNING! may be freed by this function!). * \param flag Options for linking, used for instantiating. * \param scene The scene in which to instantiate objects/groups (if NULL, no instantiation is done). - * \param scene_layer The scene layer in which to instantiate objects/groups (if NULL, no instantiation is done). + * \param view_layer The scene layer in which to instantiate objects/groups (if NULL, no instantiation is done). */ -void BLO_library_link_end(Main *mainl, BlendHandle **bh, short flag, Scene *scene, SceneLayer *scene_layer) +void BLO_library_link_end(Main *mainl, BlendHandle **bh, short flag, Scene *scene, ViewLayer *view_layer) { FileData *fd = (FileData*)(*bh); - library_link_end(mainl, &fd, flag, scene, scene_layer); + library_link_end(mainl, &fd, flag, scene, view_layer); *bh = (BlendHandle*)fd; } diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 3c63832c575..8da4fef7b21 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -87,7 +87,7 @@ static void do_version_workspaces_create_from_screens(Main *bmain) for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { const bScreen *screen_parent = screen_parent_find(screen); WorkSpace *workspace; - SceneLayer *layer = BKE_scene_layer_from_scene_get(screen->scene); + ViewLayer *layer = BKE_view_layer_from_scene_get(screen->scene); ListBase *transform_orientations; if (screen_parent) { @@ -100,7 +100,7 @@ static void do_version_workspaces_create_from_screens(Main *bmain) workspace = BKE_workspace_add(bmain, screen->id.name + 2); } BKE_workspace_layout_add(workspace, screen, screen->id.name + 2); - BKE_workspace_render_layer_set(workspace, layer); + BKE_workspace_view_layer_set(workspace, layer); #ifdef WITH_CLAY_ENGINE BLI_strncpy(workspace->view_render.engine_id, RE_engine_id_BLENDER_CLAY, @@ -169,7 +169,7 @@ void do_versions_after_linking_280(Main *main) if (!MAIN_VERSION_ATLEAST(main, 280, 0)) { for (Scene *scene = main->scene.first; scene; scene = scene->id.next) { /* since we don't have access to FileData we check the (always valid) first render layer instead */ - if (scene->render_layers.first == NULL) { + if (scene->view_layers.first == NULL) { SceneCollection *sc_master = BKE_collection_master(scene); BLI_strncpy(sc_master->name, "Master Collection", sizeof(sc_master->name)); @@ -299,53 +299,53 @@ void do_versions_after_linking_280(Main *main) } BLI_assert(scene_collection_parent == NULL); - scene->active_layer = 0; + scene->active_view_layer = 0; /* Handle legacy render layers. */ if (!BKE_scene_uses_blender_game(scene)) { for (SceneRenderLayer *srl = scene->r.layers.first; srl; srl = srl->next) { - SceneLayer *scene_layer = BKE_scene_layer_add(scene, srl->name); + ViewLayer *view_layer = BKE_view_layer_add(scene, srl->name); if (srl->samples != 0) { /* It is up to the external engine to handle * its own doversion in this case. */ - BKE_override_scene_layer_int_add( - scene_layer, + BKE_override_view_layer_int_add( + view_layer, ID_SCE, "samples", srl->samples); } if (srl->mat_override) { - BKE_override_scene_layer_datablock_add( - scene_layer, + BKE_override_view_layer_datablock_add( + view_layer, ID_MA, "self", (ID *)srl->mat_override); } if (srl->layflag & SCE_LAY_DISABLE) { - scene_layer->flag &= ~SCENE_LAYER_RENDER; + view_layer->flag &= ~VIEW_LAYER_RENDER; } if ((srl->layflag & SCE_LAY_FRS) == 0) { - scene_layer->flag &= ~SCENE_LAYER_FREESTYLE; + view_layer->flag &= ~VIEW_LAYER_FREESTYLE; } /* XXX If we are to keep layflag it should be merged with flag (dfelinto). */ - scene_layer->layflag = srl->layflag; + view_layer->layflag = srl->layflag; /* XXX Not sure if we should keep the passes (dfelinto). */ - scene_layer->passflag = srl->passflag; - scene_layer->pass_xor = srl->pass_xor; - scene_layer->pass_alpha_threshold = srl->pass_alpha_threshold; + view_layer->passflag = srl->passflag; + view_layer->pass_xor = srl->pass_xor; + view_layer->pass_alpha_threshold = srl->pass_alpha_threshold; - BKE_freestyle_config_free(&scene_layer->freestyle_config); - scene_layer->freestyle_config = srl->freestyleConfig; - scene_layer->id_properties = srl->prop; + BKE_freestyle_config_free(&view_layer->freestyle_config); + view_layer->freestyle_config = srl->freestyleConfig; + view_layer->id_properties = srl->prop; /* unlink master collection */ - BKE_collection_unlink(scene_layer, scene_layer->layer_collections.first); + BKE_collection_unlink(view_layer, view_layer->layer_collections.first); /* Add new collection bases. */ for (int layer = 0; layer < 20; layer++) { @@ -355,7 +355,7 @@ void do_versions_after_linking_280(Main *main) if (collections[DO_VERSION_COLLECTION_VISIBLE].created & (1 << layer)) { LayerCollection *layer_collection_parent; - layer_collection_parent = BKE_collection_link(scene_layer, + layer_collection_parent = BKE_collection_link(view_layer, collections[DO_VERSION_COLLECTION_VISIBLE].collections[layer]); if (srl->lay_zmask & (1 << layer)) { @@ -382,7 +382,7 @@ void do_versions_after_linking_280(Main *main) layer_collection_child->flag = collections[j].flag_render & (~COLLECTION_DISABLED); if (collections[j].flag_render & COLLECTION_DISABLED) { - BKE_collection_disable(scene_layer, layer_collection_child); + BKE_collection_disable(view_layer, layer_collection_child); } layer_collection_child = layer_collection_child->next; @@ -395,18 +395,18 @@ void do_versions_after_linking_280(Main *main) /* for convenience set the same active object in all the layers */ if (scene->basact) { - scene_layer->basact = BKE_scene_layer_base_find(scene_layer, scene->basact->object); + view_layer->basact = BKE_view_layer_base_find(view_layer, scene->basact->object); } - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { if ((base->flag & BASE_SELECTABLED) && (base->object->flag & SELECT)) { base->flag |= BASE_SELECTED; } } } - if (BLI_findlink(&scene->render_layers, scene->r.actlay)) { - scene->active_layer = scene->r.actlay; + if (BLI_findlink(&scene->view_layers, scene->r.actlay)) { + scene->active_view_layer = scene->r.actlay; } } else { @@ -420,15 +420,15 @@ void do_versions_after_linking_280(Main *main) } BLI_freelistN(&scene->r.layers); - SceneLayer *scene_layer = BKE_scene_layer_add(scene, "Viewport"); + ViewLayer *view_layer = BKE_view_layer_add(scene, "Viewport"); /* If we ported all the original render layers, we don't need to make the viewport layer renderable. */ - if (!BLI_listbase_is_single(&scene->render_layers)) { - scene_layer->flag &= ~SCENE_LAYER_RENDER; + if (!BLI_listbase_is_single(&scene->view_layers)) { + view_layer->flag &= ~VIEW_LAYER_RENDER; } /* If layer was not set, disable it. */ LayerCollection *layer_collection_parent; - layer_collection_parent = ((LayerCollection *)scene_layer->layer_collections.first)->layer_collections.first; + layer_collection_parent = ((LayerCollection *)view_layer->layer_collections.first)->layer_collections.first; for (int layer = 0; layer < 20; layer++) { if (collections[DO_VERSION_COLLECTION_VISIBLE].created & (1 << layer)) { @@ -436,7 +436,7 @@ void do_versions_after_linking_280(Main *main) /* We only need to disable the parent collection. */ if (is_disabled) { - BKE_collection_disable(scene_layer, layer_collection_parent); + BKE_collection_disable(view_layer, layer_collection_parent); } LayerCollection *layer_collection_child; @@ -447,7 +447,7 @@ void do_versions_after_linking_280(Main *main) layer_collection_child->flag = collections[j].flag_viewport & (~COLLECTION_DISABLED); if (collections[j].flag_viewport & COLLECTION_DISABLED) { - BKE_collection_disable(scene_layer, layer_collection_child); + BKE_collection_disable(view_layer, layer_collection_child); } layer_collection_child = layer_collection_child->next; } @@ -460,7 +460,7 @@ void do_versions_after_linking_280(Main *main) /* convert active base */ if (scene->basact) { - scene_layer->basact = BKE_scene_layer_base_find(scene_layer, scene->basact->object); + view_layer->basact = BKE_view_layer_base_find(view_layer, scene->basact->object); } /* convert selected bases */ @@ -491,13 +491,13 @@ void do_versions_after_linking_280(Main *main) if (!MAIN_VERSION_ATLEAST(main, 280, 0)) { for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) { /* same render-layer as do_version_workspaces_after_lib_link will activate, - * so same layer as BKE_scene_layer_from_workspace_get would return */ - SceneLayer *layer = screen->scene->render_layers.first; + * so same layer as BKE_view_layer_from_workspace_get would return */ + ViewLayer *layer = screen->scene->view_layers.first; for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { - for (SpaceLink *scene_layer = sa->spacedata.first; scene_layer; scene_layer = scene_layer->next) { - if (scene_layer->spacetype == SPACE_OUTLINER) { - SpaceOops *soutliner = (SpaceOops *)scene_layer; + for (SpaceLink *view_layer = sa->spacedata.first; view_layer; view_layer = view_layer->next) { + if (view_layer->spacetype == SPACE_OUTLINER) { + SpaceOops *soutliner = (SpaceOops *)view_layer; soutliner->outlinevis = SO_ACT_LAYER; @@ -527,7 +527,7 @@ void do_versions_after_linking_280(Main *main) do_version_workspaces_after_lib_link(main); } - { + if (!MAIN_VERSION_ATLEAST(main, 280, 2)) { /* Cleanup any remaining SceneRenderLayer data for files that were created * with Blender 2.8 before the SceneRenderLayer > RenderLayer refactor. */ for (Scene *scene = main->scene.first; scene; scene = scene->id.next) { @@ -576,7 +576,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main) } } - if (!DNA_struct_elem_find(fd->filesdna, "Scene", "ListBase", "render_layers")) { + if (!DNA_struct_elem_find(fd->filesdna, "Scene", "ListBase", "view_layers")) { for (Scene *scene = main->scene.first; scene; scene = scene->id.next) { /* Master Collection */ scene->collection = MEM_callocN(sizeof(SceneCollection), "Master Collection"); @@ -588,8 +588,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main) !DNA_struct_elem_find(fd->filesdna, "LayerCollection", "IDProperty", "properties")) { for (Scene *scene = main->scene.first; scene; scene = scene->id.next) { - for (SceneLayer *scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - do_version_layer_collections_idproperties(&scene_layer->layer_collections); + for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + do_version_layer_collections_idproperties(&view_layer->layer_collections); } } } @@ -608,12 +608,12 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main) } } - if (!DNA_struct_elem_find(fd->filesdna, "SceneLayer", "IDProperty", "*properties")) { + if (!DNA_struct_elem_find(fd->filesdna, "ViewLayer", "IDProperty", "*properties")) { for (Scene *scene = main->scene.first; scene; scene = scene->id.next) { - for (SceneLayer *scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) { + for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { IDPropertyTemplate val = {0}; - scene_layer->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); - BKE_scene_layer_engine_settings_create(scene_layer->properties); + view_layer->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); + BKE_view_layer_engine_settings_create(view_layer->properties); } } } @@ -632,7 +632,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main) } } - { + if (!MAIN_VERSION_ATLEAST(main, 280, 2)) { if (!DNA_struct_elem_find(fd->filesdna, "View3D", "short", "custom_orientation_index")) { for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) { for (ScrArea *area = screen->areabase.first; area; area = area->next) { @@ -669,9 +669,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main) la->contact_thickness = 0.5f; } } - } - { typedef enum eNTreeDoVersionErrors { NTREE_DOVERSION_NO_ERROR = 0, NTREE_DOVERSION_NEED_OUTPUT = (1 << 0), @@ -728,9 +726,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main) BKE_report(fd->reports, RPT_ERROR, "Eevee material conversion problem. Error in console"); printf("You need to combine transparency and emission shaders to the converted Principled shader nodes.\n"); } - } - { if (!DNA_struct_elem_find(fd->filesdna, "Scene", "ViewRender", "view_render")) { for (Scene *scene = main->scene.first; scene; scene = scene->id.next) { BLI_strncpy_utf8(scene->view_render.engine_id, scene->r.engine, @@ -741,20 +737,18 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main) BKE_viewrender_init(&workspace->view_render); } } - } - { - if ((DNA_struct_elem_find(fd->filesdna, "SceneLayer", "FreestyleConfig", "freestyle_config") == false) && - DNA_struct_elem_find(fd->filesdna, "Scene", "ListBase", "render_layers")) + if ((DNA_struct_elem_find(fd->filesdna, "ViewLayer", "FreestyleConfig", "freestyle_config") == false) && + DNA_struct_elem_find(fd->filesdna, "Scene", "ListBase", "view_layers")) { for (Scene *scene = main->scene.first; scene; scene = scene->id.next) { - SceneLayer *scene_layer; - for (scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - scene_layer->flag |= SCENE_LAYER_FREESTYLE; - scene_layer->layflag = 0x7FFF; /* solid ztra halo edge strand */ - scene_layer->passflag = SCE_PASS_COMBINED | SCE_PASS_Z; - scene_layer->pass_alpha_threshold = 0.5f; - BKE_freestyle_config_init(&scene_layer->freestyle_config); + ViewLayer *view_layer; + for (view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + view_layer->flag |= VIEW_LAYER_FREESTYLE; + view_layer->layflag = 0x7FFF; /* solid ztra halo edge strand */ + view_layer->passflag = SCE_PASS_COMBINED | SCE_PASS_Z; + view_layer->pass_alpha_threshold = 0.5f; + BKE_freestyle_config_init(&view_layer->freestyle_config); } } } diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index 910a3c28286..e2d4b140311 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -127,9 +127,9 @@ void BLO_update_defaults_startup_blend(Main *bmain) scene->r.im_format.planes = R_IMF_PLANES_RGBA; scene->r.im_format.compress = 15; - for (SceneLayer *scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - scene_layer->freestyle_config.sphere_radius = 0.1f; - scene_layer->pass_alpha_threshold = 0.5f; + for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + view_layer->freestyle_config.sphere_radius = 0.1f; + view_layer->pass_alpha_threshold = 0.5f; } if (scene->toolsettings) { diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 79ae203df09..36c524796ce 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -2146,7 +2146,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main) sce->r.yparts = 4; /* We don't add default layer since blender2.8 because the layers - * are now in Scene->render_layers and a default layer is created in + * are now in Scene->view_layers and a default layer is created in * the doversion later on. */ SceneRenderLayer *srl; diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 172c5384f15..6c39b0d486a 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1086,7 +1086,7 @@ static void write_nodetree_nolib(WriteData *wd, bNodeTree *ntree) */ static void current_screen_compat( Main *mainvar, bool use_active_win, - bScreen **r_screen, Scene **r_scene, SceneLayer **r_render_layer) + bScreen **r_screen, Scene **r_scene, ViewLayer **r_render_layer) { wmWindowManager *wm; wmWindow *window = NULL; @@ -1118,7 +1118,7 @@ static void current_screen_compat( *r_screen = (window) ? BKE_workspace_active_screen_get(window->workspace_hook) : NULL; *r_scene = (window) ? window->scene : NULL; - *r_render_layer = (window) ? BKE_workspace_render_layer_get(workspace) : NULL; + *r_render_layer = (window) ? BKE_workspace_view_layer_get(workspace) : NULL; } typedef struct RenderInfo { @@ -1134,7 +1134,7 @@ static void write_renderinfo(WriteData *wd, Main *mainvar) { bScreen *curscreen; Scene *sce, *curscene = NULL; - SceneLayer *render_layer; + ViewLayer *render_layer; RenderInfo data; /* XXX in future, handle multiple windows with multiple screens? */ @@ -2771,27 +2771,27 @@ static void write_scene(WriteData *wd, Scene *sce) write_curvemapping_curves(wd, &sce->r.mblur_shutter_curve); write_scene_collection(wd, sce->collection); - for (SceneLayer *scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - writestruct(wd, DATA, SceneLayer, 1, scene_layer); - writelist(wd, DATA, Base, &scene_layer->object_bases); + for (ViewLayer *view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) { + writestruct(wd, DATA, ViewLayer, 1, view_layer); + writelist(wd, DATA, Base, &view_layer->object_bases); - if (scene_layer->properties) { - IDP_WriteProperty(scene_layer->properties, wd); + if (view_layer->properties) { + IDP_WriteProperty(view_layer->properties, wd); } - if (scene_layer->id_properties) { - IDP_WriteProperty(scene_layer->id_properties, wd); + if (view_layer->id_properties) { + IDP_WriteProperty(view_layer->id_properties, wd); } - for (FreestyleModuleConfig *fmc = scene_layer->freestyle_config.modules.first; fmc; fmc = fmc->next) { + for (FreestyleModuleConfig *fmc = view_layer->freestyle_config.modules.first; fmc; fmc = fmc->next) { writestruct(wd, DATA, FreestyleModuleConfig, 1, fmc); } - for (FreestyleLineSet *fls = scene_layer->freestyle_config.linesets.first; fls; fls = fls->next) { + for (FreestyleLineSet *fls = view_layer->freestyle_config.linesets.first; fls; fls = fls->next) { writestruct(wd, DATA, FreestyleLineSet, 1, fls); } - write_layer_collections(wd, &scene_layer->layer_collections); + write_layer_collections(wd, &view_layer->layer_collections); } if (sce->layer_properties) { @@ -3828,7 +3828,7 @@ static void write_global(WriteData *wd, int fileflags, Main *mainvar) FileGlobal fg; bScreen *screen; Scene *scene; - SceneLayer *render_layer; + ViewLayer *render_layer; char subvstr[8]; /* prevent mem checkers from complaining */ @@ -3841,7 +3841,7 @@ static void write_global(WriteData *wd, int fileflags, Main *mainvar) /* XXX still remap G */ fg.curscreen = screen; fg.curscene = scene; - fg.cur_render_layer = render_layer; + fg.cur_view_layer = render_layer; /* prevent to save this, is not good convention, and feature with concerns... */ fg.fileflags = (fileflags & ~G_FILE_FLAGS_RUNTIME); diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index bc986f11394..8908d0e603f 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -134,7 +134,7 @@ bool DocumentImporter::import() loader.registerExtraDataCallbackHandler(ehandler); // deselect all to select new objects - BKE_scene_layer_base_deselect_all(CTX_data_scene_layer(mContext)); + BKE_view_layer_base_deselect_all(CTX_data_view_layer(mContext)); std::string mFilename = std::string(this->import_settings->filepath); const std::string encodedFilename = bc_url_encode(mFilename); diff --git a/source/blender/collada/collada.cpp b/source/blender/collada/collada.cpp index e9285bf24ff..6c5fb0b33f3 100644 --- a/source/blender/collada/collada.cpp +++ b/source/blender/collada/collada.cpp @@ -69,7 +69,7 @@ int collada_import(bContext *C, int collada_export(const EvaluationContext *eval_ctx, Scene *sce, - SceneLayer *scene_layer, + ViewLayer *view_layer, const char *filepath, int apply_modifiers, @@ -124,7 +124,7 @@ int collada_export(const EvaluationContext *eval_ctx, if (export_settings.include_children) includeFilter |= OB_REL_CHILDREN_RECURSIVE; eObjectSet objectSet = (export_settings.selected) ? OB_SET_SELECTED : OB_SET_ALL; - export_settings.export_set = BKE_object_relational_superset(scene_layer, objectSet, (eObRelationTypes)includeFilter); + export_settings.export_set = BKE_object_relational_superset(view_layer, objectSet, (eObRelationTypes)includeFilter); int export_count = BLI_linklist_count(export_settings.export_set); if (export_count == 0) { diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h index 1cec6a53922..eb3964f9cb7 100644 --- a/source/blender/collada/collada.h +++ b/source/blender/collada/collada.h @@ -48,7 +48,7 @@ typedef enum BC_export_transformation_type { struct bContext; struct Scene; -struct SceneLayer; +struct ViewLayer; struct EvaluationContext; /* @@ -66,7 +66,7 @@ int collada_import(struct bContext *C, int collada_export(const struct EvaluationContext *eval_ctx, struct Scene *sce, - struct SceneLayer *scene_layer, + struct ViewLayer *view_layer, const char *filepath, int apply_modifiers, BC_export_mesh_type export_mesh_type, diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 85976c64b5f..1a6f2675cc7 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -144,13 +144,13 @@ Object *bc_add_object(Scene *scene, int type, const char *name) DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); /* XXX Collada should use the context scene layer, not the scene one. (dfelinto/gaia). */ - SceneLayer *scene_layer = BKE_scene_layer_context_active_PLACEHOLDER(scene); + ViewLayer *view_layer = BKE_view_layer_context_active_PLACEHOLDER(scene); - LayerCollection *layer_collection = BKE_layer_collection_get_active_ensure(scene, scene_layer); + LayerCollection *layer_collection = BKE_layer_collection_get_active_ensure(scene, view_layer); BKE_collection_object_add(scene, layer_collection->scene_collection, ob); - Base *base = BKE_scene_layer_base_find(scene_layer, ob); - BKE_scene_layer_base_select(scene_layer, base); + Base *base = BKE_view_layer_base_find(view_layer, ob); + BKE_view_layer_base_select(view_layer, base); return ob; } diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp index d1bb8462aa1..e16aca3fdee 100644 --- a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp +++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp @@ -65,12 +65,12 @@ void RenderLayersNode::testRenderLink(NodeConverter &converter, missingRenderLink(converter); return; } - SceneLayer *scene_layer = (SceneLayer *)BLI_findlink(&scene->render_layers, layerId); - if (scene_layer == NULL) { + ViewLayer *view_layer = (ViewLayer *)BLI_findlink(&scene->view_layers, layerId); + if (view_layer == NULL) { missingRenderLink(converter); return; } - RenderLayer *rl = RE_GetRenderLayer(rr, scene_layer->name); + RenderLayer *rl = RE_GetRenderLayer(rr, view_layer->name); if (rl == NULL) { missingRenderLink(converter); return; diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cpp b/source/blender/compositor/operations/COM_RenderLayersProg.cpp index eec05f582f0..a5e2d275e4f 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp +++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp @@ -55,10 +55,10 @@ void RenderLayersProg::initExecution() rr = RE_AcquireResultRead(re); if (rr) { - SceneLayer *scene_layer = (SceneLayer *)BLI_findlink(&scene->render_layers, getLayerId()); - if (scene_layer) { + ViewLayer *view_layer = (ViewLayer *)BLI_findlink(&scene->view_layers, getLayerId()); + if (view_layer) { - RenderLayer *rl = RE_GetRenderLayer(rr, scene_layer->name); + RenderLayer *rl = RE_GetRenderLayer(rr, view_layer->name); if (rl) { this->m_inputBuffer = RE_RenderLayerGetPass(rl, this->m_passName.c_str(), this->m_viewName); } @@ -189,9 +189,9 @@ void RenderLayersProg::determineResolution(unsigned int resolution[2], unsigned rr = RE_AcquireResultRead(re); if (rr) { - SceneLayer *scene_layer = (SceneLayer *)BLI_findlink(&sce->render_layers, getLayerId()); - if (scene_layer) { - RenderLayer *rl = RE_GetRenderLayer(rr, scene_layer->name); + ViewLayer *view_layer = (ViewLayer *)BLI_findlink(&sce->view_layers, getLayerId()); + if (view_layer) { + RenderLayer *rl = RE_GetRenderLayer(rr, view_layer->name); if (rl) { resolution[0] = rl->rectx; resolution[1] = rl->recty; diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt index 8de24cebcd5..8b1ce5a9926 100644 --- a/source/blender/depsgraph/CMakeLists.txt +++ b/source/blender/depsgraph/CMakeLists.txt @@ -45,13 +45,13 @@ set(SRC intern/builder/deg_builder_nodes.cc intern/builder/deg_builder_nodes_layer_collection.cc intern/builder/deg_builder_nodes_rig.cc - intern/builder/deg_builder_nodes_scene_layer.cc + intern/builder/deg_builder_nodes_view_layer.cc intern/builder/deg_builder_pchanmap.cc intern/builder/deg_builder_relations.cc intern/builder/deg_builder_relations_keys.cc intern/builder/deg_builder_relations_layer_collection.cc intern/builder/deg_builder_relations_rig.cc - intern/builder/deg_builder_relations_scene_layer.cc + intern/builder/deg_builder_relations_view_layer.cc intern/builder/deg_builder_transitive.cc intern/debug/deg_debug_graphviz.cc intern/eval/deg_eval.cc diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.h index 6bd24e7ba2b..b224303fb84 100644 --- a/source/blender/depsgraph/DEG_depsgraph.h +++ b/source/blender/depsgraph/DEG_depsgraph.h @@ -67,7 +67,7 @@ struct PointerRNA; struct PropertyRNA; struct RenderEngineType; struct Scene; -struct SceneLayer; +struct ViewLayer; typedef enum eEvaluationMode { DAG_EVAL_VIEWPORT = 0, /* evaluate for OpenGL viewport */ @@ -85,7 +85,7 @@ typedef struct EvaluationContext { float ctime; struct Depsgraph *depsgraph; - struct SceneLayer *scene_layer; + struct ViewLayer *view_layer; struct RenderEngineType *engine; } EvaluationContext; @@ -211,7 +211,7 @@ void DEG_evaluation_context_init(struct EvaluationContext *eval_ctx, eEvaluationMode mode); void DEG_evaluation_context_init_from_scene(struct EvaluationContext *eval_ctx, struct Scene *scene, - struct SceneLayer *scene_layer, + struct ViewLayer *view_layer, struct RenderEngineType *engine, eEvaluationMode mode); diff --git a/source/blender/depsgraph/DEG_depsgraph_build.h b/source/blender/depsgraph/DEG_depsgraph_build.h index e328d3d9e8c..c85c15e2aa2 100644 --- a/source/blender/depsgraph/DEG_depsgraph_build.h +++ b/source/blender/depsgraph/DEG_depsgraph_build.h @@ -48,7 +48,7 @@ struct Main; struct ModifierData; struct Object; struct Scene; -struct SceneLayer; +struct ViewLayer; #ifdef __cplusplus extern "C" { @@ -59,10 +59,10 @@ extern "C" { /* Build depsgraph for the given scene, and dump results in given * graph container. */ -void DEG_graph_build_from_scene_layer(struct Depsgraph *graph, +void DEG_graph_build_from_view_layer(struct Depsgraph *graph, struct Main *bmain, struct Scene *scene, - struct SceneLayer *scene_layer); + struct ViewLayer *view_layer); /* Tag relations from the given graph for update. */ void DEG_graph_tag_relations_update(struct Depsgraph *graph); @@ -71,7 +71,7 @@ void DEG_graph_tag_relations_update(struct Depsgraph *graph); void DEG_graph_relations_update(struct Depsgraph *graph, struct Main *bmain, struct Scene *scene, - struct SceneLayer *scene_layer); + struct ViewLayer *view_layer); /* Tag all relations in the database for update.*/ void DEG_relations_tag_update(struct Main *bmain); diff --git a/source/blender/depsgraph/DEG_depsgraph_debug.h b/source/blender/depsgraph/DEG_depsgraph_debug.h index fd6dff4c973..bd03874436b 100644 --- a/source/blender/depsgraph/DEG_depsgraph_debug.h +++ b/source/blender/depsgraph/DEG_depsgraph_debug.h @@ -41,7 +41,7 @@ extern "C" { struct Depsgraph; struct Scene; -struct SceneLayer; +struct ViewLayer; /* ------------------------------------------------ */ @@ -65,7 +65,7 @@ bool DEG_debug_compare(const struct Depsgraph *graph1, bool DEG_debug_graph_relations_validate(struct Depsgraph *graph, struct Main *bmain, struct Scene *scene, - struct SceneLayer *scene_layer); + struct ViewLayer *view_layer); /* Perform consistency check on the graph. */ bool DEG_debug_consistency_check(struct Depsgraph *graph); diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.h index ddd0f16b3bf..36d44a06eac 100644 --- a/source/blender/depsgraph/DEG_depsgraph_query.h +++ b/source/blender/depsgraph/DEG_depsgraph_query.h @@ -43,7 +43,7 @@ struct Depsgraph; struct DupliObject; struct ListBase; struct Scene; -struct SceneLayer; +struct ViewLayer; #ifdef __cplusplus extern "C" { @@ -59,7 +59,7 @@ short DEG_get_eval_flags_for_id(struct Depsgraph *graph, struct ID *id); struct Scene *DEG_get_evaluated_scene(struct Depsgraph *graph); /* Get scene layer the despgraph is created for. */ -struct SceneLayer *DEG_get_evaluated_scene_layer(struct Depsgraph *graph); +struct ViewLayer *DEG_get_evaluated_view_layer(struct Depsgraph *graph); /* Get evaluated version of object for given original one. */ struct Object *DEG_get_evaluated_object(struct Depsgraph *depsgraph, struct Object *object); diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h index d03aaac0f16..76977aa7e5b 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h @@ -157,8 +157,8 @@ struct DepsgraphNodeBuilder { const char *name = "", int name_tag = -1); - void build_scene_layer(Scene *scene, - SceneLayer *scene_layer, + void build_view_layer(Scene *scene, + ViewLayer *view_layer, eDepsNode_LinkedState_Type linked_state); void build_group(Group *group); void build_object(Object *ob, @@ -205,7 +205,7 @@ struct DepsgraphNodeBuilder { LayerCollectionState *state); void build_layer_collections(ListBase *layer_collections, LayerCollectionState *state); - void build_scene_layer_collections(SceneLayer *scene_layer); + void build_view_layer_collections(ViewLayer *view_layer); protected: /* State which never changes, same for the whole builder time. */ Main *bmain_; diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc index 8f67c64f1b3..77985528c89 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc @@ -77,7 +77,7 @@ void DepsgraphNodeBuilder::build_layer_collection( _1, layer_collection, state->parent), - DEG_OPCODE_SCENE_LAYER_EVAL, + DEG_OPCODE_VIEW_LAYER_EVAL, layer_collection->scene_collection->name, state->index); ++state->index; @@ -97,23 +97,23 @@ void DepsgraphNodeBuilder::build_layer_collections(ListBase *layer_collections, } } -void DepsgraphNodeBuilder::build_scene_layer_collections( - SceneLayer *scene_layer) +void DepsgraphNodeBuilder::build_view_layer_collections( + ViewLayer *view_layer) { Scene *scene_cow; - SceneLayer *scene_layer_cow; + ViewLayer *view_layer_cow; if (DEG_depsgraph_use_copy_on_write()) { /* Make sure we've got ID node, so we can get pointer to CoW datablock. */ scene_cow = expand_cow_datablock(scene_); - scene_layer_cow = (SceneLayer *)BLI_findstring( - &scene_cow->render_layers, - scene_layer->name, - offsetof(SceneLayer, name)); + view_layer_cow = (ViewLayer *)BLI_findstring( + &scene_cow->view_layers, + view_layer->name, + offsetof(ViewLayer, name)); } else { scene_cow = scene_; - scene_layer_cow = scene_layer; + view_layer_cow = view_layer; } LayerCollectionState state; @@ -125,17 +125,17 @@ void DepsgraphNodeBuilder::build_scene_layer_collections( function_bind(BKE_layer_eval_layer_collection_pre, _1, scene_cow, - scene_layer_cow), - DEG_OPCODE_SCENE_LAYER_INIT, - scene_layer->name); + view_layer_cow), + DEG_OPCODE_VIEW_LAYER_INIT, + view_layer->name); add_operation_node(comp, function_bind(BKE_layer_eval_layer_collection_post, _1, - scene_layer_cow), - DEG_OPCODE_SCENE_LAYER_DONE, - scene_layer->name); + view_layer_cow), + DEG_OPCODE_VIEW_LAYER_DONE, + view_layer->name); state.parent = NULL; - build_layer_collections(&scene_layer_cow->layer_collections, &state); + build_layer_collections(&view_layer_cow->layer_collections, &state); } } // namespace DEG diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc index 1a0ce53d0c8..20dc239c6d0 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene_layer.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc @@ -65,9 +65,9 @@ extern "C" { namespace DEG { -void DepsgraphNodeBuilder::build_scene_layer(Scene *scene, - SceneLayer *scene_layer, - eDepsNode_LinkedState_Type linked_state) +void DepsgraphNodeBuilder::build_view_layer(Scene *scene, + ViewLayer *view_layer, + eDepsNode_LinkedState_Type linked_state) { /* scene ID block */ add_id_node(&scene->id); @@ -79,8 +79,8 @@ void DepsgraphNodeBuilder::build_scene_layer(Scene *scene, // XXX: depending on how this goes, that scene itself could probably store its // own little partial depsgraph? if (scene->set != NULL) { - SceneLayer *set_scene_layer = BKE_scene_layer_from_scene_get(scene->set); - build_scene_layer(scene->set, set_scene_layer, DEG_ID_LINKED_VIA_SET); + ViewLayer *set_view_layer = BKE_view_layer_from_scene_get(scene->set); + build_view_layer(scene->set, set_view_layer, DEG_ID_LINKED_VIA_SET); } /* Setup currently building context. */ @@ -88,7 +88,7 @@ void DepsgraphNodeBuilder::build_scene_layer(Scene *scene, /* scene objects */ int select_color = 1; - LINKLIST_FOREACH(Base *, base, &scene_layer->object_bases) { + LINKLIST_FOREACH(Base *, base, &view_layer->object_bases) { /* object itself */ build_object(base->object, linked_state); base->object->select_color = select_color++; @@ -141,7 +141,7 @@ void DepsgraphNodeBuilder::build_scene_layer(Scene *scene, } /* Collections. */ - build_scene_layer_collections(scene_layer); + build_view_layer_collections(view_layer); /* Parameters evaluation for scene relations mainly. */ add_operation_node(&scene->id, diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h index 48d0cf76a7f..b3e5ed9f7f9 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h @@ -65,7 +65,7 @@ struct Object; struct bPoseChannel; struct bConstraint; struct Scene; -struct SceneLayer; +struct ViewLayer; struct Tex; struct World; struct EffectorWeights; @@ -186,7 +186,7 @@ struct DepsgraphRelationBuilder const DepsNodeHandle *handle, const char *description); - void build_scene_layer(Scene *scene, SceneLayer *scene_layer); + void build_view_layer(Scene *scene, ViewLayer *view_layer); void build_group(Object *object, Group *group); void build_object(Object *ob); void build_object_parent(Object *ob); @@ -250,7 +250,7 @@ struct DepsgraphRelationBuilder LayerCollectionState *state); void build_layer_collections(ListBase *layer_collections, LayerCollectionState *state); - void build_scene_layer_collections(SceneLayer *scene_layer); + void build_view_layer_collections(ViewLayer *view_layer); void build_copy_on_write_relations(); void build_copy_on_write_relations(IDDepsNode *id_node); diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc index 0deed3ed4ed..2e4ab0f0f84 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc @@ -74,7 +74,7 @@ void DepsgraphRelationBuilder::build_layer_collection( { OperationKey layer_key(&scene_->id, DEG_NODE_TYPE_LAYER_COLLECTIONS, - DEG_OPCODE_SCENE_LAYER_EVAL, + DEG_OPCODE_VIEW_LAYER_EVAL, layer_collection->scene_collection->name, state->index); add_relation(state->prev_key, layer_key, "Layer collection order"); @@ -96,26 +96,26 @@ void DepsgraphRelationBuilder::build_layer_collections( } } -void DepsgraphRelationBuilder::build_scene_layer_collections( - SceneLayer *scene_layer) +void DepsgraphRelationBuilder::build_view_layer_collections( + ViewLayer *view_layer) { LayerCollectionState state; state.index = 0; OperationKey init_key(&scene_->id, DEG_NODE_TYPE_LAYER_COLLECTIONS, - DEG_OPCODE_SCENE_LAYER_INIT, - scene_layer->name); + DEG_OPCODE_VIEW_LAYER_INIT, + view_layer->name); OperationKey done_key(&scene_->id, DEG_NODE_TYPE_LAYER_COLLECTIONS, - DEG_OPCODE_SCENE_LAYER_DONE, - scene_layer->name); + DEG_OPCODE_VIEW_LAYER_DONE, + view_layer->name); state.init_key = init_key; state.done_key = done_key; state.prev_key = init_key; - build_layer_collections(&scene_layer->layer_collections, &state); + build_layer_collections(&view_layer->layer_collections, &state); add_relation(state.prev_key, done_key, "Layer collection order"); } diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc index 055c832811b..db75a3d9e5e 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene_layer.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc @@ -68,21 +68,21 @@ extern "C" { namespace DEG { -void DepsgraphRelationBuilder::build_scene_layer(Scene *scene, SceneLayer *scene_layer) +void DepsgraphRelationBuilder::build_view_layer(Scene *scene, ViewLayer *view_layer) { if (scene->set != NULL) { - SceneLayer *set_scene_layer = BKE_scene_layer_from_scene_get(scene->set); - build_scene_layer(scene->set, set_scene_layer); + ViewLayer *set_view_layer = BKE_view_layer_from_scene_get(scene->set); + build_view_layer(scene->set, set_view_layer); } graph_->scene = scene; - graph_->scene_layer = scene_layer; + graph_->view_layer = view_layer; /* Setup currently building context. */ scene_ = scene; /* scene objects */ - LINKLIST_FOREACH(Base *, base, &scene_layer->object_bases) { + LINKLIST_FOREACH(Base *, base, &view_layer->object_bases) { build_object(base->object); } if (scene->camera != NULL) { @@ -125,7 +125,7 @@ void DepsgraphRelationBuilder::build_scene_layer(Scene *scene, SceneLayer *scene } /* Collections. */ - build_scene_layer_collections(scene_layer); + build_view_layer_collections(view_layer); /* TODO(sergey): Do this flush on CoW object? */ foreach (OperationDepsNode *node, graph_->operations) { diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 4a27dddf949..d9b814f5a77 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -84,7 +84,7 @@ Depsgraph::Depsgraph() : time_source(NULL), need_update(true), scene(NULL), - scene_layer(NULL) + view_layer(NULL) { BLI_spin_init(&lock); id_hash = BLI_ghash_ptr_new("Depsgraph id hash"); diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.h index b3ac345cef7..d841ae045f2 100644 --- a/source/blender/depsgraph/intern/depsgraph.h +++ b/source/blender/depsgraph/intern/depsgraph.h @@ -47,7 +47,7 @@ struct GSet; struct PointerRNA; struct PropertyRNA; struct Scene; -struct SceneLayer; +struct ViewLayer; namespace DEG { @@ -177,7 +177,7 @@ struct Depsgraph { /* Scene and layer this dependency graph is built for. */ Scene *scene; - SceneLayer *scene_layer; + ViewLayer *view_layer; }; } // namespace DEG diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc index 80d3df2811c..34ca2244b3a 100644 --- a/source/blender/depsgraph/intern/depsgraph_build.cc +++ b/source/blender/depsgraph/intern/depsgraph_build.cc @@ -196,13 +196,13 @@ void DEG_add_special_eval_flag(Depsgraph *graph, ID *id, short flag) /* Build depsgraph for the given scene layer, and dump results in given * graph container. */ -void DEG_graph_build_from_scene_layer(Depsgraph *graph, +void DEG_graph_build_from_view_layer(Depsgraph *graph, Main *bmain, Scene *scene, - SceneLayer *scene_layer) + ViewLayer *view_layer) { #ifdef DEBUG_TIME - TIMEIT_START(DEG_graph_build_from_scene_layer); + TIMEIT_START(DEG_graph_build_from_view_layer); #endif DEG::Depsgraph *deg_graph = reinterpret_cast<DEG::Depsgraph *>(graph); @@ -218,8 +218,8 @@ void DEG_graph_build_from_scene_layer(Depsgraph *graph, /* 1) Generate all the nodes in the graph first */ DEG::DepsgraphNodeBuilder node_builder(bmain, deg_graph); node_builder.begin_build(); - node_builder.build_scene_layer(scene, - scene_layer, + node_builder.build_view_layer(scene, + view_layer, DEG::DEG_ID_LINKED_DIRECTLY); /* 2) Hook up relationships between operations - to determine evaluation @@ -227,7 +227,7 @@ void DEG_graph_build_from_scene_layer(Depsgraph *graph, */ DEG::DepsgraphRelationBuilder relation_builder(bmain, deg_graph); relation_builder.begin_build(); - relation_builder.build_scene_layer(scene, scene_layer); + relation_builder.build_view_layer(scene, view_layer); if (DEG_depsgraph_use_copy_on_write()) { relation_builder.build_copy_on_write_relations(); } @@ -255,7 +255,7 @@ void DEG_graph_build_from_scene_layer(Depsgraph *graph, #endif #ifdef DEBUG_TIME - TIMEIT_END(DEG_graph_build_from_scene_layer); + TIMEIT_END(DEG_graph_build_from_view_layer); #endif /* Relations are up to date. */ @@ -277,14 +277,14 @@ void DEG_graph_tag_relations_update(Depsgraph *graph) void DEG_graph_relations_update(Depsgraph *graph, Main *bmain, Scene *scene, - SceneLayer *scene_layer) + ViewLayer *view_layer) { DEG::Depsgraph *deg_graph = (DEG::Depsgraph *)graph; if (!deg_graph->need_update) { /* Graph is up to date, nothing to do. */ return; } - DEG_graph_build_from_scene_layer(graph, bmain, scene, scene_layer); + DEG_graph_build_from_view_layer(graph, bmain, scene, view_layer); } /* Tag all relations for update. */ @@ -292,10 +292,10 @@ void DEG_relations_tag_update(Main *bmain) { DEG_DEBUG_PRINTF("%s: Tagging relations for update.\n", __func__); LINKLIST_FOREACH(Scene *, scene, &bmain->scene) { - LINKLIST_FOREACH(SceneLayer *, scene_layer, &scene->render_layers) { + LINKLIST_FOREACH(ViewLayer *, view_layer, &scene->view_layers) { Depsgraph *depsgraph = (Depsgraph *)BKE_scene_get_depsgraph(scene, - scene_layer, + view_layer, false); if (depsgraph != NULL) { DEG_graph_tag_relations_update(depsgraph); diff --git a/source/blender/depsgraph/intern/depsgraph_debug.cc b/source/blender/depsgraph/intern/depsgraph_debug.cc index 72d074dd505..42c1cf861eb 100644 --- a/source/blender/depsgraph/intern/depsgraph_debug.cc +++ b/source/blender/depsgraph/intern/depsgraph_debug.cc @@ -67,11 +67,11 @@ bool DEG_debug_compare(const struct Depsgraph *graph1, bool DEG_debug_graph_relations_validate(Depsgraph *graph, Main *bmain, Scene *scene, - SceneLayer *scene_layer) + ViewLayer *view_layer) { Depsgraph *temp_depsgraph = DEG_graph_new(); bool valid = true; - DEG_graph_build_from_scene_layer(temp_depsgraph, bmain, scene, scene_layer); + DEG_graph_build_from_view_layer(temp_depsgraph, bmain, scene, view_layer); if (!DEG_debug_compare(temp_depsgraph, graph)) { fprintf(stderr, "ERROR! Depsgraph wasn't tagged for update when it should have!\n"); BLI_assert(!"This should not happen!"); diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc index 00b07307933..31332b416d5 100644 --- a/source/blender/depsgraph/intern/depsgraph_eval.cc +++ b/source/blender/depsgraph/intern/depsgraph_eval.cc @@ -80,13 +80,13 @@ void DEG_evaluation_context_init(EvaluationContext *eval_ctx, void DEG_evaluation_context_init_from_scene(EvaluationContext *eval_ctx, Scene *scene, - SceneLayer *scene_layer, + ViewLayer *view_layer, RenderEngineType *engine, eEvaluationMode mode) { DEG_evaluation_context_init(eval_ctx, mode); - eval_ctx->depsgraph = BKE_scene_get_depsgraph(scene, scene_layer, false); - eval_ctx->scene_layer = scene_layer; + eval_ctx->depsgraph = BKE_scene_get_depsgraph(scene, view_layer, false); + eval_ctx->view_layer = view_layer; eval_ctx->engine = engine; eval_ctx->ctime = BKE_scene_frame_get(scene); BLI_assert(eval_ctx->depsgraph != NULL); diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc index ee75b9b348b..9740e93ffec 100644 --- a/source/blender/depsgraph/intern/depsgraph_query.cc +++ b/source/blender/depsgraph/intern/depsgraph_query.cc @@ -91,16 +91,16 @@ Scene *DEG_get_evaluated_scene(Depsgraph *graph) return reinterpret_cast<Scene *>(deg_graph->get_cow_id(&scene_orig->id)); } -SceneLayer *DEG_get_evaluated_scene_layer(Depsgraph *graph) +ViewLayer *DEG_get_evaluated_view_layer(Depsgraph *graph) { DEG::Depsgraph *deg_graph = reinterpret_cast<DEG::Depsgraph *>(graph); Scene *scene_cow = DEG_get_evaluated_scene(graph); - SceneLayer *scene_layer_orig = deg_graph->scene_layer; - SceneLayer *scene_layer_cow = - (SceneLayer *)BLI_findstring(&scene_cow->render_layers, - scene_layer_orig->name, - offsetof(SceneLayer, name)); - return scene_layer_cow; + ViewLayer *view_layer_orig = deg_graph->view_layer; + ViewLayer *view_layer_cow = + (ViewLayer *)BLI_findstring(&scene_cow->view_layers, + view_layer_orig->name, + offsetof(ViewLayer, name)); + return view_layer_cow; } Object *DEG_get_evaluated_object(Depsgraph *depsgraph, Object *object) @@ -132,18 +132,18 @@ ID *DEG_get_evaluated_id(struct Depsgraph *depsgraph, ID *id) * and instead we should have a tag to the objects that were not directly part of the depsgraph). * * That means that the object is not in a collection but it's part of depsgraph, or the object is simply - * not in the current SceneLayer - Depsgraph at the moment includes all the SceneLayer in the Scene. + * not in the current ViewLayer - Depsgraph at the moment includes all the ViewLayer in the Scene. */ static bool deg_flush_base_flags_and_settings( DEGObjectsIteratorData *data, Object *ob_dst, Object *ob_src, const bool is_dupli) { Base *base; Depsgraph *graph = data->graph; - SceneLayer *scene_layer = data->eval_ctx.scene_layer; + ViewLayer *view_layer = data->eval_ctx.view_layer; int flag = is_dupli ? BASE_FROMDUPLI : 0; - /* First attempt, see if object is in the current SceneLayer. */ - base = (Base *)BLI_findptr(&scene_layer->object_bases, ob_src, offsetof(Base, object)); + /* First attempt, see if object is in the current ViewLayer. */ + base = (Base *)BLI_findptr(&view_layer->object_bases, ob_src, offsetof(Base, object)); /* Next attempt, see if object is in one of the sets. */ if (base == NULL) { @@ -151,8 +151,8 @@ static bool deg_flush_base_flags_and_settings( scene_iter = scene; while ((scene_iter = (scene_iter)->set)) { - SceneLayer *scene_layer_set = BKE_scene_layer_from_scene_get(scene_iter); - base = (Base *)BLI_findptr(&scene_layer_set->object_bases, ob_src, offsetof(Base, object)); + ViewLayer *view_layer_set = BKE_view_layer_from_scene_get(scene_iter); + base = (Base *)BLI_findptr(&view_layer_set->object_bases, ob_src, offsetof(Base, object)); if (base != NULL) { flag |= BASE_FROM_SET; flag &= ~(BASE_SELECTED | BASE_SELECTABLED); @@ -272,7 +272,7 @@ void DEG_objects_iterator_begin(BLI_Iterator *iter, DEGObjectsIteratorData *data /* TODO(sergey): What evaluation type we want here? */ DEG_evaluation_context_init(&data->eval_ctx, DAG_EVAL_RENDER); - data->eval_ctx.scene_layer = DEG_get_evaluated_scene_layer(depsgraph); + data->eval_ctx.view_layer = DEG_get_evaluated_view_layer(depsgraph); iter->data = data; data->dupli_parent = NULL; diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index 607ec675a39..58bae1f5cc6 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -352,10 +352,10 @@ void deg_id_tag_update(Main *bmain, ID *id, int flag) { lib_id_recalc_tag_flag(bmain, id, flag); LINKLIST_FOREACH(Scene *, scene, &bmain->scene) { - LINKLIST_FOREACH(SceneLayer *, scene_layer, &scene->render_layers) { + LINKLIST_FOREACH(ViewLayer *, view_layer, &scene->view_layers) { Depsgraph *depsgraph = (Depsgraph *)BKE_scene_get_depsgraph(scene, - scene_layer, + view_layer, false); if (depsgraph != NULL) { deg_graph_id_tag_update(bmain, depsgraph, id, flag); @@ -461,10 +461,10 @@ void DEG_graph_on_visible_update(Main *bmain, Depsgraph *depsgraph) void DEG_on_visible_update(Main *bmain, const bool UNUSED(do_time)) { LINKLIST_FOREACH(Scene *, scene, &bmain->scene) { - LINKLIST_FOREACH(SceneLayer *, scene_layer, &scene->render_layers) { + LINKLIST_FOREACH(ViewLayer *, view_layer, &scene->view_layers) { Depsgraph *depsgraph = (Depsgraph *)BKE_scene_get_depsgraph(scene, - scene_layer, + view_layer, false); if (depsgraph != NULL) { DEG_graph_on_visible_update(bmain, depsgraph); diff --git a/source/blender/depsgraph/intern/depsgraph_type_defines.cc b/source/blender/depsgraph/intern/depsgraph_type_defines.cc index 6dfe1565bb1..f5f1980557f 100644 --- a/source/blender/depsgraph/intern/depsgraph_type_defines.cc +++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cc @@ -140,9 +140,9 @@ static const char *stringify_opcode(eDepsOperation_Code opcode) STRINGIFY_OPCODE(MASK_ANIMATION); STRINGIFY_OPCODE(MASK_EVAL); /* Collections. */ - STRINGIFY_OPCODE(SCENE_LAYER_INIT); - STRINGIFY_OPCODE(SCENE_LAYER_EVAL); - STRINGIFY_OPCODE(SCENE_LAYER_DONE); + STRINGIFY_OPCODE(VIEW_LAYER_INIT); + STRINGIFY_OPCODE(VIEW_LAYER_EVAL); + STRINGIFY_OPCODE(VIEW_LAYER_DONE); /* Copy on write. */ STRINGIFY_OPCODE(COPY_ON_WRITE); /* Shading. */ diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h index 7f68220f3fa..d7084a38a94 100644 --- a/source/blender/depsgraph/intern/depsgraph_types.h +++ b/source/blender/depsgraph/intern/depsgraph_types.h @@ -233,9 +233,9 @@ typedef enum eDepsOperation_Code { DEG_OPCODE_PARTICLE_SETTINGS_RECALC_CLEAR, /* Collections. ------------------------------------- */ - DEG_OPCODE_SCENE_LAYER_INIT, - DEG_OPCODE_SCENE_LAYER_EVAL, - DEG_OPCODE_SCENE_LAYER_DONE, + DEG_OPCODE_VIEW_LAYER_INIT, + DEG_OPCODE_VIEW_LAYER_EVAL, + DEG_OPCODE_VIEW_LAYER_DONE, /* Copy on Write. ------------------------------------ */ DEG_OPCODE_COPY_ON_WRITE, diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc index f5b11785441..5aebd6814a0 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval.cc @@ -278,7 +278,7 @@ void deg_evaluate_on_refresh(EvaluationContext *eval_ctx, /* Set time for the current graph evaluation context. */ TimeSourceDepsNode *time_src = graph->find_time_source(); eval_ctx->depsgraph = (::Depsgraph *)graph; - eval_ctx->scene_layer = DEG_get_evaluated_scene_layer((::Depsgraph *)graph); + eval_ctx->view_layer = DEG_get_evaluated_view_layer((::Depsgraph *)graph); eval_ctx->ctime = time_src->cfra; /* XXX could use a separate pool for each eval context */ diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index 1d3c2d596ee..99efd633524 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -477,31 +477,31 @@ void update_copy_on_write_scene(const Depsgraph *depsgraph, scene_cow->r.cfra = scene_orig->r.cfra; scene_cow->r.subframe = scene_orig->r.subframe; // Update bases. - const SceneLayer *scene_layer_orig = (SceneLayer *)scene_orig->render_layers.first; - SceneLayer *scene_layer_cow = (SceneLayer *)scene_cow->render_layers.first; - while (scene_layer_orig != NULL) { + const ViewLayer *view_layer_orig = (ViewLayer *)scene_orig->view_layers.first; + ViewLayer *view_layer_cow = (ViewLayer *)scene_cow->view_layers.first; + while (view_layer_orig != NULL) { // Update pointers to active base. - if (scene_layer_orig->basact == NULL) { - scene_layer_cow->basact = NULL; + if (view_layer_orig->basact == NULL) { + view_layer_cow->basact = NULL; } else { - const Object *obact_orig = scene_layer_orig->basact->object; + const Object *obact_orig = view_layer_orig->basact->object; Object *obact_cow = (Object *)depsgraph->get_cow_id(&obact_orig->id); - scene_layer_cow->basact = BKE_scene_layer_base_find(scene_layer_cow, obact_cow); + view_layer_cow->basact = BKE_view_layer_base_find(view_layer_cow, obact_cow); } // Update base flags. // // TODO(sergey): We should probably check visibled/selectabled // flag here? - const Base *base_orig = (Base *)scene_layer_orig->object_bases.first; - Base *base_cow = (Base *)scene_layer_cow->object_bases.first;; + const Base *base_orig = (Base *)view_layer_orig->object_bases.first; + Base *base_cow = (Base *)view_layer_cow->object_bases.first;; while (base_orig != NULL) { base_cow->flag = base_orig->flag; base_orig = base_orig->next; base_cow = base_cow->next; } - scene_layer_orig = scene_layer_orig->next; - scene_layer_cow = scene_layer_cow->next; + view_layer_orig = view_layer_orig->next; + view_layer_cow = view_layer_cow->next; } // Update edit object pointer. if (scene_orig->obedit != NULL) { diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h index e96aec0766f..da7524754de 100644 --- a/source/blender/draw/DRW_engine.h +++ b/source/blender/draw/DRW_engine.h @@ -36,7 +36,7 @@ struct DrawEngineType; struct IDProperty; struct bContext; struct Object; -struct SceneLayer; +struct ViewLayer; struct ViewContext; struct ViewportEngineData; struct View3D; diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c index 760ecab12d3..fe81e1e484c 100644 --- a/source/blender/draw/engines/clay/clay_engine.c +++ b/source/blender/draw/engines/clay/clay_engine.c @@ -144,11 +144,11 @@ typedef struct CLAY_Data { CLAY_StorageList *stl; } CLAY_Data; -typedef struct CLAY_SceneLayerData { +typedef struct CLAY_ViewLayerData { struct GPUTexture *jitter_tx; struct GPUUniformBuffer *sampling_ubo; int cached_sample_num; -} CLAY_SceneLayerData; +} CLAY_ViewLayerData; /* *********** STATIC *********** */ @@ -187,20 +187,20 @@ typedef struct CLAY_PrivateData { /* Functions */ -static void clay_scene_layer_data_free(void *storage) +static void clay_view_layer_data_free(void *storage) { - CLAY_SceneLayerData *sldata = (CLAY_SceneLayerData *)storage; + CLAY_ViewLayerData *sldata = (CLAY_ViewLayerData *)storage; DRW_UBO_FREE_SAFE(sldata->sampling_ubo); DRW_TEXTURE_FREE_SAFE(sldata->jitter_tx); } -static CLAY_SceneLayerData *CLAY_scene_layer_data_get(void) +static CLAY_ViewLayerData *CLAY_view_layer_data_get(void) { - CLAY_SceneLayerData **sldata = (CLAY_SceneLayerData **)DRW_scene_layer_engine_data_get(&draw_engine_clay_type, &clay_scene_layer_data_free); + CLAY_ViewLayerData **sldata = (CLAY_ViewLayerData **)DRW_view_layer_engine_data_get(&draw_engine_clay_type, &clay_view_layer_data_free); if (*sldata == NULL) { - *sldata = MEM_callocN(sizeof(**sldata), "CLAY_SceneLayerData"); + *sldata = MEM_callocN(sizeof(**sldata), "CLAY_ViewLayerData"); } return *sldata; @@ -326,7 +326,7 @@ static void CLAY_engine_init(void *vedata) { CLAY_StorageList *stl = ((CLAY_Data *)vedata)->stl; CLAY_FramebufferList *fbl = ((CLAY_Data *)vedata)->fbl; - CLAY_SceneLayerData *sldata = CLAY_scene_layer_data_get(); + CLAY_ViewLayerData *sldata = CLAY_view_layer_data_get(); /* Create Texture Array */ if (!e_data.matcap_array) { @@ -424,9 +424,9 @@ static void CLAY_engine_init(void *vedata) /* SSAO setup */ { const DRWContextState *draw_ctx = DRW_context_state_get(); - SceneLayer *scene_layer = draw_ctx->scene_layer; - IDProperty *props = BKE_scene_layer_engine_evaluated_get( - scene_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_CLAY); + ViewLayer *view_layer = draw_ctx->view_layer; + IDProperty *props = BKE_view_layer_engine_evaluated_get( + view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_CLAY); int ssao_samples = BKE_collection_engine_property_value_get_int(props, "ssao_samples"); float invproj[4][4]; @@ -497,7 +497,7 @@ static void CLAY_engine_init(void *vedata) static DRWShadingGroup *CLAY_shgroup_create(CLAY_Data *vedata, DRWPass *pass, int *material_id, bool use_flat) { CLAY_StorageList *stl = vedata->stl; - CLAY_SceneLayerData *sldata = CLAY_scene_layer_data_get(); + CLAY_ViewLayerData *sldata = CLAY_view_layer_data_get(); DRWShadingGroup *grp = DRW_shgroup_create(use_flat ? e_data.clay_flat_sh : e_data.clay_sh, pass); DRW_shgroup_uniform_vec2(grp, "screenres", DRW_viewport_size_get(), 1); @@ -885,7 +885,7 @@ static void CLAY_layer_collection_settings_create(RenderEngine *UNUSED(engine), BKE_collection_engine_property_add_float(props, "hair_brightness_randomness", 0.0f); } -static void CLAY_scene_layer_settings_create(RenderEngine *UNUSED(engine), IDProperty *props) +static void CLAY_view_layer_settings_create(RenderEngine *UNUSED(engine), IDProperty *props) { BLI_assert(props && props->type == IDP_GROUP && @@ -923,7 +923,7 @@ RenderEngineType DRW_engine_viewport_clay_type = { CLAY_ENGINE, N_("Clay"), RE_INTERNAL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &CLAY_layer_collection_settings_create, - &CLAY_scene_layer_settings_create, + &CLAY_view_layer_settings_create, &draw_engine_clay_type, {NULL, NULL, NULL} }; diff --git a/source/blender/draw/engines/eevee/eevee_bloom.c b/source/blender/draw/engines/eevee/eevee_bloom.c index 5aef1dc966c..63c030a574f 100644 --- a/source/blender/draw/engines/eevee/eevee_bloom.c +++ b/source/blender/draw/engines/eevee/eevee_bloom.c @@ -80,7 +80,7 @@ static void eevee_create_shader_bloom(void) "#define HIGH_QUALITY\n"); } -int EEVEE_bloom_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +int EEVEE_bloom_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_StorageList *stl = vedata->stl; EEVEE_FramebufferList *fbl = vedata->fbl; @@ -88,8 +88,8 @@ int EEVEE_bloom_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) EEVEE_EffectsInfo *effects = stl->effects; const DRWContextState *draw_ctx = DRW_context_state_get(); - SceneLayer *scene_layer = draw_ctx->scene_layer; - IDProperty *props = BKE_scene_layer_engine_evaluated_get(scene_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); + ViewLayer *view_layer = draw_ctx->view_layer; + IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); if (BKE_collection_engine_property_value_get_bool(props, "bloom_enable")) { const float *viewport_size = DRW_viewport_size_get(); @@ -225,7 +225,7 @@ static DRWShadingGroup *eevee_create_bloom_pass( return grp; } -void EEVEE_bloom_cache_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +void EEVEE_bloom_cache_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_StorageList *stl = vedata->stl; diff --git a/source/blender/draw/engines/eevee/eevee_data.c b/source/blender/draw/engines/eevee/eevee_data.c index 149a3740411..6b95844591d 100644 --- a/source/blender/draw/engines/eevee/eevee_data.c +++ b/source/blender/draw/engines/eevee/eevee_data.c @@ -22,16 +22,16 @@ /** \file eevee_data.c * \ingroup draw_engine * - * All specific data handler for Objects, Lights, SceneLayers, ... + * All specific data handler for Objects, Lights, ViewLayers, ... */ #include "DRW_render.h" #include "eevee_private.h" -static void eevee_scene_layer_data_free(void *storage) +static void eevee_view_layer_data_free(void *storage) { - EEVEE_SceneLayerData *sldata = (EEVEE_SceneLayerData *)storage; + EEVEE_ViewLayerData *sldata = (EEVEE_ViewLayerData *)storage; /* Lights */ MEM_SAFE_FREE(sldata->lamps); @@ -78,13 +78,13 @@ static void eevee_lightprobe_data_free(void *storage) BLI_freelistN(&ped->captured_object_list); } -EEVEE_SceneLayerData *EEVEE_scene_layer_data_get(void) +EEVEE_ViewLayerData *EEVEE_view_layer_data_get(void) { - EEVEE_SceneLayerData **sldata = (EEVEE_SceneLayerData **)DRW_scene_layer_engine_data_get( - &draw_engine_eevee_type, &eevee_scene_layer_data_free); + EEVEE_ViewLayerData **sldata = (EEVEE_ViewLayerData **)DRW_view_layer_engine_data_get( + &draw_engine_eevee_type, &eevee_view_layer_data_free); if (*sldata == NULL) { - *sldata = MEM_callocN(sizeof(**sldata), "EEVEE_SceneLayerData"); + *sldata = MEM_callocN(sizeof(**sldata), "EEVEE_ViewLayerData"); } return *sldata; diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c index eaf4767f4a0..ef7e6412fc4 100644 --- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c +++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c @@ -74,7 +74,7 @@ static void eevee_create_shader_depth_of_field(void) datatoc_effect_dof_frag_glsl, "#define STEP_RESOLVE\n"); } -int EEVEE_depth_of_field_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +int EEVEE_depth_of_field_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_StorageList *stl = vedata->stl; EEVEE_FramebufferList *fbl = vedata->fbl; @@ -82,8 +82,8 @@ int EEVEE_depth_of_field_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data * EEVEE_EffectsInfo *effects = stl->effects; const DRWContextState *draw_ctx = DRW_context_state_get(); - SceneLayer *scene_layer = draw_ctx->scene_layer; - IDProperty *props = BKE_scene_layer_engine_evaluated_get(scene_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); + ViewLayer *view_layer = draw_ctx->view_layer; + IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); if (BKE_collection_engine_property_value_get_bool(props, "dof_enable")) { Scene *scene = draw_ctx->scene; @@ -183,7 +183,7 @@ int EEVEE_depth_of_field_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data * return 0; } -void EEVEE_depth_of_field_cache_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +void EEVEE_depth_of_field_cache_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_StorageList *stl = vedata->stl; diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index 1c486073818..703369a86ee 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -105,7 +105,7 @@ static void eevee_create_shader_downsample(void) "#define COPY_DEPTH\n"); } -void EEVEE_effects_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata) +void EEVEE_effects_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) { EEVEE_StorageList *stl = vedata->stl; EEVEE_FramebufferList *fbl = vedata->fbl; @@ -207,7 +207,7 @@ void EEVEE_effects_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata) } } -void EEVEE_effects_cache_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +void EEVEE_effects_cache_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_StorageList *stl = vedata->stl; diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index 72ebfe94f16..2378a3c8784 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -50,7 +50,7 @@ static void EEVEE_engine_init(void *ved) EEVEE_TextureList *txl = vedata->txl; EEVEE_FramebufferList *fbl = vedata->fbl; EEVEE_StorageList *stl = ((EEVEE_Data *)vedata)->stl; - EEVEE_SceneLayerData *sldata = EEVEE_scene_layer_data_get(); + EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_get(); if (!stl->g_data) { /* Alloc transient pointers */ @@ -85,7 +85,7 @@ static void EEVEE_engine_init(void *ved) static void EEVEE_cache_init(void *vedata) { EEVEE_PassList *psl = ((EEVEE_Data *)vedata)->psl; - EEVEE_SceneLayerData *sldata = EEVEE_scene_layer_data_get(); + EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_get(); EEVEE_bloom_cache_init(sldata, vedata); EEVEE_depth_of_field_cache_init(sldata, vedata); @@ -103,7 +103,7 @@ static void EEVEE_cache_init(void *vedata) static void EEVEE_cache_populate(void *vedata, Object *ob) { - EEVEE_SceneLayerData *sldata = EEVEE_scene_layer_data_get(); + EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_get(); const DRWContextState *draw_ctx = DRW_context_state_get(); const bool is_active = (ob == draw_ctx->obact); @@ -153,7 +153,7 @@ static void EEVEE_cache_populate(void *vedata, Object *ob) static void EEVEE_cache_finish(void *vedata) { - EEVEE_SceneLayerData *sldata = EEVEE_scene_layer_data_get(); + EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_get(); EEVEE_materials_cache_finish(vedata); EEVEE_lights_cache_finish(sldata); @@ -165,7 +165,7 @@ static void EEVEE_draw_scene(void *vedata) EEVEE_PassList *psl = ((EEVEE_Data *)vedata)->psl; EEVEE_StorageList *stl = ((EEVEE_Data *)vedata)->stl; EEVEE_FramebufferList *fbl = ((EEVEE_Data *)vedata)->fbl; - EEVEE_SceneLayerData *sldata = EEVEE_scene_layer_data_get(); + EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_get(); /* Default framebuffer and texture */ DefaultTextureList *dtxl = DRW_viewport_texture_list_get(); @@ -312,7 +312,7 @@ static void EEVEE_layer_collection_settings_create(RenderEngine *UNUSED(engine), UNUSED_VARS_NDEBUG(props); } -static void EEVEE_scene_layer_settings_create(RenderEngine *UNUSED(engine), IDProperty *props) +static void EEVEE_view_layer_settings_create(RenderEngine *UNUSED(engine), IDProperty *props) { BLI_assert(props && props->type == IDP_GROUP && @@ -400,7 +400,7 @@ RenderEngineType DRW_engine_viewport_eevee_type = { NULL, NULL, EEVEE_ENGINE, N_("Eevee"), RE_INTERNAL | RE_USE_SHADING_NODES, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - &EEVEE_layer_collection_settings_create, &EEVEE_scene_layer_settings_create, + &EEVEE_layer_collection_settings_create, &EEVEE_view_layer_settings_create, &draw_engine_eevee_type, {NULL, NULL, NULL} }; diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c index a8b9b963cb1..73eaeaa3f07 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.c +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c @@ -126,7 +126,7 @@ static void planar_pool_ensure_alloc(EEVEE_Data *vedata, int num_planar_ref) /* TODO get screen percentage from layer setting */ // const DRWContextState *draw_ctx = DRW_context_state_get(); - // SceneLayer *scene_layer = draw_ctx->scene_layer; + // ViewLayer *view_layer = draw_ctx->view_layer; float screen_percentage = 1.0f; int width = (int)(viewport_size[0] * screen_percentage); @@ -157,11 +157,11 @@ static void planar_pool_ensure_alloc(EEVEE_Data *vedata, int num_planar_ref) } } -void EEVEE_lightprobes_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *UNUSED(vedata)) +void EEVEE_lightprobes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *UNUSED(vedata)) { const DRWContextState *draw_ctx = DRW_context_state_get(); - SceneLayer *scene_layer = draw_ctx->scene_layer; - IDProperty *props = BKE_scene_layer_engine_evaluated_get(scene_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); + ViewLayer *view_layer = draw_ctx->view_layer; + IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); /* Shaders */ if (!e_data.probe_filter_glossy_sh) { @@ -333,7 +333,7 @@ void EEVEE_lightprobes_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *UNUSED(ved } } -void EEVEE_lightprobes_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata) +void EEVEE_lightprobes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) { EEVEE_TextureList *txl = vedata->txl; EEVEE_PassList *psl = vedata->psl; @@ -472,7 +472,7 @@ void EEVEE_lightprobes_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *veda } } -void EEVEE_lightprobes_cache_add(EEVEE_SceneLayerData *sldata, Object *ob) +void EEVEE_lightprobes_cache_add(EEVEE_ViewLayerData *sldata, Object *ob) { EEVEE_LightProbesInfo *pinfo = sldata->probes; LightProbe *probe = (LightProbe *)ob->data; @@ -529,7 +529,7 @@ static void scale_m4_v3(float R[4][4], float v[3]) mul_v3_v3(R[i], v); } -static void EEVEE_planar_reflections_updates(EEVEE_SceneLayerData *sldata, EEVEE_StorageList *stl) +static void EEVEE_planar_reflections_updates(EEVEE_ViewLayerData *sldata, EEVEE_StorageList *stl) { EEVEE_LightProbesInfo *pinfo = sldata->probes; Object *ob; @@ -634,7 +634,7 @@ static void EEVEE_planar_reflections_updates(EEVEE_SceneLayerData *sldata, EEVEE } } -static void EEVEE_lightprobes_updates(EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl, EEVEE_StorageList *stl) +static void EEVEE_lightprobes_updates(EEVEE_ViewLayerData *sldata, EEVEE_PassList *psl, EEVEE_StorageList *stl) { EEVEE_LightProbesInfo *pinfo = sldata->probes; Object *ob; @@ -761,7 +761,7 @@ static void EEVEE_lightprobes_updates(EEVEE_SceneLayerData *sldata, EEVEE_PassLi } } -void EEVEE_lightprobes_cache_finish(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata) +void EEVEE_lightprobes_cache_finish(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) { EEVEE_StorageList *stl = vedata->stl; EEVEE_LightProbesInfo *pinfo = sldata->probes; @@ -870,7 +870,7 @@ static void downsample_planar(void *vedata, int level) } /* Glossy filter probe_rt to probe_pool at index probe_idx */ -static void glossy_filter_probe(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata, EEVEE_PassList *psl, int probe_idx) +static void glossy_filter_probe(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, EEVEE_PassList *psl, int probe_idx) { EEVEE_LightProbesInfo *pinfo = sldata->probes; @@ -943,7 +943,7 @@ static void glossy_filter_probe(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata } /* Diffuse filter probe_rt to irradiance_pool at index probe_idx */ -static void diffuse_filter_probe(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata, EEVEE_PassList *psl, int offset) +static void diffuse_filter_probe(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, EEVEE_PassList *psl, int offset) { EEVEE_LightProbesInfo *pinfo = sldata->probes; @@ -991,7 +991,7 @@ static void diffuse_filter_probe(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedat /* Render the scene to the probe_rt texture. */ static void render_scene_to_probe( - EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata, + EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, const float pos[3], float clipsta, float clipend) { EEVEE_TextureList *txl = vedata->txl; @@ -1101,7 +1101,7 @@ static void render_scene_to_probe( } static void render_scene_to_planar( - EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata, int layer, + EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, int layer, float (*viewmat)[4], float (*persmat)[4], float clip_plane[4]) { @@ -1183,7 +1183,7 @@ static void render_scene_to_planar( DRW_framebuffer_texture_detach(txl->planar_depth); } -static void render_world_to_probe(EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl) +static void render_world_to_probe(EEVEE_ViewLayerData *sldata, EEVEE_PassList *psl) { EEVEE_LightProbesInfo *pinfo = sldata->probes; float winmat[4][4], wininv[4][4]; @@ -1253,7 +1253,7 @@ static void lightprobe_cell_world_location_get(EEVEE_LightGrid *egrid, float loc add_v3_v3(r_pos, tmp); } -void EEVEE_lightprobes_refresh(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata) +void EEVEE_lightprobes_refresh(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) { EEVEE_TextureList *txl = vedata->txl; EEVEE_PassList *psl = vedata->psl; diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c index 17295713001..2293b4208ad 100644 --- a/source/blender/draw/engines/eevee/eevee_lights.c +++ b/source/blender/draw/engines/eevee/eevee_lights.c @@ -72,15 +72,15 @@ extern char datatoc_concentric_samples_lib_glsl[]; /* *********** FUNCTIONS *********** */ -void EEVEE_lights_init(EEVEE_SceneLayerData *sldata) +void EEVEE_lights_init(EEVEE_ViewLayerData *sldata) { const unsigned int shadow_ubo_size = sizeof(EEVEE_Shadow) * MAX_SHADOW + sizeof(EEVEE_ShadowCube) * MAX_SHADOW_CUBE + sizeof(EEVEE_ShadowCascade) * MAX_SHADOW_CASCADE; const DRWContextState *draw_ctx = DRW_context_state_get(); - SceneLayer *scene_layer = draw_ctx->scene_layer; - IDProperty *props = BKE_scene_layer_engine_evaluated_get(scene_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); + ViewLayer *view_layer = draw_ctx->view_layer; + IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); if (!e_data.shadow_sh) { e_data.shadow_sh = DRW_shader_create( @@ -169,7 +169,7 @@ void EEVEE_lights_init(EEVEE_SceneLayerData *sldata) } } -void EEVEE_lights_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl) +void EEVEE_lights_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_PassList *psl) { EEVEE_LampsInfo *linfo = sldata->lamps; @@ -244,7 +244,7 @@ void EEVEE_lights_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl) BLI_freelistN(&sldata->shadow_casters); } -void EEVEE_lights_cache_add(EEVEE_SceneLayerData *sldata, Object *ob) +void EEVEE_lights_cache_add(EEVEE_ViewLayerData *sldata, Object *ob) { EEVEE_LampsInfo *linfo = sldata->lamps; @@ -327,7 +327,7 @@ void EEVEE_lights_cache_add(EEVEE_SceneLayerData *sldata, Object *ob) /* Add a shadow caster to the shadowpasses */ void EEVEE_lights_cache_shcaster_add( - EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl, struct Gwn_Batch *geom, float (*obmat)[4]) + EEVEE_ViewLayerData *sldata, EEVEE_PassList *psl, struct Gwn_Batch *geom, float (*obmat)[4]) { DRWShadingGroup *grp = DRW_shgroup_instance_create(e_data.shadow_sh, psl->shadow_cube_pass, geom); DRW_shgroup_uniform_block(grp, "shadow_render_block", sldata->shadow_render_ubo); @@ -341,7 +341,7 @@ void EEVEE_lights_cache_shcaster_add( } void EEVEE_lights_cache_shcaster_material_add( - EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl, struct GPUMaterial *gpumat, + EEVEE_ViewLayerData *sldata, EEVEE_PassList *psl, struct GPUMaterial *gpumat, struct Gwn_Batch *geom, struct Object *ob, float (*obmat)[4], float *alpha_threshold) { DRWShadingGroup *grp = DRW_shgroup_material_instance_create(gpumat, psl->shadow_cube_pass, geom, ob); @@ -366,7 +366,7 @@ void EEVEE_lights_cache_shcaster_material_add( DRW_shgroup_set_instance_count(grp, MAX_CASCADE_NUM); } -void EEVEE_lights_cache_finish(EEVEE_SceneLayerData *sldata) +void EEVEE_lights_cache_finish(EEVEE_ViewLayerData *sldata) { EEVEE_LampsInfo *linfo = sldata->lamps; DRWTextureFormat shadow_pool_format = DRW_TEX_R_32; @@ -862,7 +862,7 @@ static void light_tag_shadow_update(Object *lamp, Object *ob) } } -static void eevee_lights_shcaster_updated(EEVEE_SceneLayerData *sldata, Object *ob) +static void eevee_lights_shcaster_updated(EEVEE_ViewLayerData *sldata, Object *ob) { Object *lamp; EEVEE_LampsInfo *linfo = sldata->lamps; @@ -874,7 +874,7 @@ static void eevee_lights_shcaster_updated(EEVEE_SceneLayerData *sldata, Object * } } -void EEVEE_lights_update(EEVEE_SceneLayerData *sldata) +void EEVEE_lights_update(EEVEE_ViewLayerData *sldata) { EEVEE_LampsInfo *linfo = sldata->lamps; Object *ob; @@ -911,7 +911,7 @@ void EEVEE_lights_update(EEVEE_SceneLayerData *sldata) } /* this refresh lamps shadow buffers */ -void EEVEE_draw_shadows(EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl) +void EEVEE_draw_shadows(EEVEE_ViewLayerData *sldata, EEVEE_PassList *psl) { EEVEE_LampsInfo *linfo = sldata->lamps; Object *ob; diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 4a9633b4f44..62e2cd3805c 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -348,7 +348,7 @@ static char *eevee_get_volume_defines(int options) * ssr_id can be null to disable ssr contribution. **/ static void add_standard_uniforms( - DRWShadingGroup *shgrp, EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata, + DRWShadingGroup *shgrp, EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, int *ssr_id, float *refract_depth, bool use_ssrefraction, bool use_alpha_blend) { if (ssr_id == NULL || !vedata->stl->g_data->valid_double_buffer) { @@ -764,7 +764,7 @@ struct GPUMaterial *EEVEE_material_hair_get( * Create a default shading group inside the given pass. **/ static struct DRWShadingGroup *EEVEE_default_shading_group_create( - EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata, DRWPass *pass, + EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, DRWPass *pass, bool is_hair, bool is_flat_normal, bool use_blend, bool use_ssr, int shadow_method) { static int ssr_id; @@ -792,7 +792,7 @@ static struct DRWShadingGroup *EEVEE_default_shading_group_create( * Create a default shading group inside the default pass without standard uniforms. **/ static struct DRWShadingGroup *EEVEE_default_shading_group_get( - EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata, + EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, bool is_hair, bool is_flat_normal, bool use_ssr, int shadow_method) { static int ssr_id; @@ -826,8 +826,8 @@ void EEVEE_materials_cache_init(EEVEE_Data *vedata) { const DRWContextState *draw_ctx = DRW_context_state_get(); - SceneLayer *scene_layer = draw_ctx->scene_layer; - IDProperty *props = BKE_scene_layer_engine_evaluated_get(scene_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); + ViewLayer *view_layer = draw_ctx->view_layer; + IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); /* Global AO Switch*/ stl->effects->use_ao = BKE_collection_engine_property_value_get_bool(props, "gtao_enable"); stl->effects->use_bent_normals = BKE_collection_engine_property_value_get_bool(props, "gtao_use_bent_normals"); @@ -963,7 +963,7 @@ typedef struct EeveeMaterialShadingGroups { } EeveeMaterialShadingGroups; static void material_opaque( - Material *ma, GHash *material_hash, EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata, + Material *ma, GHash *material_hash, EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, bool do_cull, bool use_flat_nor, struct GPUMaterial **gpumat, struct GPUMaterial **gpumat_depth, struct DRWShadingGroup **shgrp, struct DRWShadingGroup **shgrp_depth, struct DRWShadingGroup **shgrp_depth_clip) { @@ -1094,7 +1094,7 @@ static void material_opaque( } static void material_transparent( - Material *ma, EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata, + Material *ma, EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, bool do_cull, bool use_flat_nor, struct GPUMaterial **gpumat, struct DRWShadingGroup **shgrp, struct DRWShadingGroup **shgrp_depth) { const DRWContextState *draw_ctx = DRW_context_state_get(); @@ -1182,7 +1182,7 @@ static void material_transparent( } } -void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_SceneLayerData *sldata, Object *ob) +void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sldata, Object *ob) { EEVEE_PassList *psl = ((EEVEE_Data *)vedata)->psl; EEVEE_StorageList *stl = ((EEVEE_Data *)vedata)->stl; diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c index b9ec1f8b186..43aaec1b4ba 100644 --- a/source/blender/draw/engines/eevee/eevee_motion_blur.c +++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c @@ -110,18 +110,18 @@ static void eevee_create_shader_motion_blur(void) e_data.motion_blur_sh = DRW_shader_create_fullscreen(datatoc_effect_motion_blur_frag_glsl, NULL); } -int EEVEE_motion_blur_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +int EEVEE_motion_blur_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_StorageList *stl = vedata->stl; EEVEE_EffectsInfo *effects = stl->effects; const DRWContextState *draw_ctx = DRW_context_state_get(); - SceneLayer *scene_layer = draw_ctx->scene_layer; + ViewLayer *view_layer = draw_ctx->view_layer; Scene *scene = draw_ctx->scene; View3D *v3d = draw_ctx->v3d; RegionView3D *rv3d = draw_ctx->rv3d; ARegion *ar = draw_ctx->ar; - IDProperty *props = BKE_scene_layer_engine_evaluated_get(scene_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); + IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); if (BKE_collection_engine_property_value_get_bool(props, "motion_blur_enable") && (draw_ctx->evil_C != NULL)) { /* Update Motion Blur Matrices */ @@ -162,7 +162,7 @@ int EEVEE_motion_blur_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *ved return 0; } -void EEVEE_motion_blur_cache_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +void EEVEE_motion_blur_cache_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_StorageList *stl = vedata->stl; diff --git a/source/blender/draw/engines/eevee/eevee_occlusion.c b/source/blender/draw/engines/eevee/eevee_occlusion.c index a6b35ce1b16..c1dde385284 100644 --- a/source/blender/draw/engines/eevee/eevee_occlusion.c +++ b/source/blender/draw/engines/eevee/eevee_occlusion.c @@ -60,7 +60,7 @@ static void eevee_create_shader_occlusion(void) MEM_freeN(frag_str); } -int EEVEE_occlusion_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +int EEVEE_occlusion_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_StorageList *stl = vedata->stl; EEVEE_FramebufferList *fbl = vedata->fbl; @@ -68,8 +68,8 @@ int EEVEE_occlusion_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedat EEVEE_EffectsInfo *effects = stl->effects; const DRWContextState *draw_ctx = DRW_context_state_get(); - SceneLayer *scene_layer = draw_ctx->scene_layer; - IDProperty *props = BKE_scene_layer_engine_evaluated_get(scene_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); + ViewLayer *view_layer = draw_ctx->view_layer; + IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); if (BKE_collection_engine_property_value_get_bool(props, "gtao_enable")) { const float *viewport_size = DRW_viewport_size_get(); @@ -142,7 +142,7 @@ int EEVEE_occlusion_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedat return 0; } -void EEVEE_occlusion_cache_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +void EEVEE_occlusion_cache_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_StorageList *stl = vedata->stl; @@ -193,7 +193,7 @@ void EEVEE_occlusion_cache_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data } } -void EEVEE_occlusion_compute(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +void EEVEE_occlusion_compute(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_TextureList *txl = vedata->txl; @@ -221,7 +221,7 @@ void EEVEE_occlusion_compute(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *v } } -void EEVEE_occlusion_draw_debug(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +void EEVEE_occlusion_draw_debug(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_FramebufferList *fbl = vedata->fbl; diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index 6a3adb36a7c..a97f7db5c0d 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -515,7 +515,7 @@ enum { }; /* ************** SCENE LAYER DATA ************** */ -typedef struct EEVEE_SceneLayerData { +typedef struct EEVEE_ViewLayerData { /* Lamps */ struct EEVEE_LampsInfo *lamps; @@ -554,7 +554,7 @@ typedef struct EEVEE_SceneLayerData { /* Volumetrics */ struct EEVEE_VolumetricsInfo *volumetrics; -} EEVEE_SceneLayerData; +} EEVEE_ViewLayerData; /* ************ OBJECT DATA ************ */ typedef struct EEVEE_LampEngineData { @@ -624,7 +624,7 @@ typedef struct EEVEE_PrivateData { } EEVEE_PrivateData; /* Transient data */ /* eevee_data.c */ -EEVEE_SceneLayerData *EEVEE_scene_layer_data_get(void); +EEVEE_ViewLayerData *EEVEE_view_layer_data_get(void); EEVEE_ObjectEngineData *EEVEE_object_data_get(Object *ob); EEVEE_LightProbeEngineData *EEVEE_lightprobe_data_get(Object *ob); EEVEE_LampEngineData *EEVEE_lamp_data_get(Object *ob); @@ -633,7 +633,7 @@ EEVEE_LampEngineData *EEVEE_lamp_data_get(Object *ob); struct GPUTexture *EEVEE_materials_get_util_tex(void); /* XXX */ void EEVEE_materials_init(EEVEE_StorageList *stl); void EEVEE_materials_cache_init(EEVEE_Data *vedata); -void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_SceneLayerData *sldata, Object *ob); +void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sldata, Object *ob); void EEVEE_materials_cache_finish(EEVEE_Data *vedata); struct GPUMaterial *EEVEE_material_world_lightprobe_get(struct Scene *scene, struct World *wo); struct GPUMaterial *EEVEE_material_world_background_get(struct Scene *scene, struct World *wo); @@ -649,90 +649,90 @@ void EEVEE_draw_default_passes(EEVEE_PassList *psl); void EEVEE_update_util_texture(float offset); /* eevee_lights.c */ -void EEVEE_lights_init(EEVEE_SceneLayerData *sldata); -void EEVEE_lights_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl); -void EEVEE_lights_cache_add(EEVEE_SceneLayerData *sldata, struct Object *ob); +void EEVEE_lights_init(EEVEE_ViewLayerData *sldata); +void EEVEE_lights_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_PassList *psl); +void EEVEE_lights_cache_add(EEVEE_ViewLayerData *sldata, struct Object *ob); void EEVEE_lights_cache_shcaster_add( - EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl, struct Gwn_Batch *geom, float (*obmat)[4]); + EEVEE_ViewLayerData *sldata, EEVEE_PassList *psl, struct Gwn_Batch *geom, float (*obmat)[4]); void EEVEE_lights_cache_shcaster_material_add( - EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl, + EEVEE_ViewLayerData *sldata, EEVEE_PassList *psl, struct GPUMaterial *gpumat, struct Gwn_Batch *geom, struct Object *ob, float (*obmat)[4], float *alpha_threshold); -void EEVEE_lights_cache_finish(EEVEE_SceneLayerData *sldata); -void EEVEE_lights_update(EEVEE_SceneLayerData *sldata); -void EEVEE_draw_shadows(EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl); +void EEVEE_lights_cache_finish(EEVEE_ViewLayerData *sldata); +void EEVEE_lights_update(EEVEE_ViewLayerData *sldata); +void EEVEE_draw_shadows(EEVEE_ViewLayerData *sldata, EEVEE_PassList *psl); void EEVEE_lights_free(void); /* eevee_lightprobes.c */ -void EEVEE_lightprobes_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_lightprobes_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_lightprobes_cache_add(EEVEE_SceneLayerData *sldata, Object *ob); -void EEVEE_lightprobes_cache_finish(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_lightprobes_refresh(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_lightprobes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_lightprobes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_lightprobes_cache_add(EEVEE_ViewLayerData *sldata, Object *ob); +void EEVEE_lightprobes_cache_finish(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_lightprobes_refresh(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_lightprobes_free(void); /* eevee_depth_of_field.c */ -int EEVEE_depth_of_field_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_depth_of_field_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); +int EEVEE_depth_of_field_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_depth_of_field_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_depth_of_field_draw(EEVEE_Data *vedata); void EEVEE_depth_of_field_free(void); /* eevee_bloom.c */ -int EEVEE_bloom_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_bloom_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); +int EEVEE_bloom_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_bloom_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_bloom_draw(EEVEE_Data *vedata); void EEVEE_bloom_free(void); /* eevee_occlusion.c */ -int EEVEE_occlusion_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_occlusion_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_occlusion_compute(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_occlusion_draw_debug(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); +int EEVEE_occlusion_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_occlusion_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_occlusion_compute(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_occlusion_draw_debug(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_occlusion_free(void); /* eevee_screen_raytrace.c */ -int EEVEE_screen_raytrace_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_screen_raytrace_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_refraction_compute(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_reflection_compute(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); +int EEVEE_screen_raytrace_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_screen_raytrace_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_refraction_compute(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_reflection_compute(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_screen_raytrace_free(void); /* eevee_subsurface.c */ -int EEVEE_subsurface_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_subsurface_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); +int EEVEE_subsurface_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_subsurface_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_subsurface_add_pass(EEVEE_Data *vedata, unsigned int sss_id, struct GPUUniformBuffer *sss_profile); -void EEVEE_subsurface_data_render(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_subsurface_compute(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_subsurface_data_render(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_subsurface_compute(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_subsurface_free(void); /* eevee_motion_blur.c */ -int EEVEE_motion_blur_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_motion_blur_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); +int EEVEE_motion_blur_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_motion_blur_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_motion_blur_draw(EEVEE_Data *vedata); void EEVEE_motion_blur_free(void); /* eevee_temporal_sampling.c */ -int EEVEE_temporal_sampling_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_temporal_sampling_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); +int EEVEE_temporal_sampling_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_temporal_sampling_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_temporal_sampling_draw(EEVEE_Data *vedata); void EEVEE_temporal_sampling_free(void); /* eevee_volumes.c */ -int EEVEE_volumes_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_volumes_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_volumes_cache_object_add(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata, struct Scene *scene, Object *ob); -void EEVEE_volumes_compute(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_volumes_resolve(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); +int EEVEE_volumes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_volumes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, struct Scene *scene, Object *ob); +void EEVEE_volumes_compute(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_volumes_resolve(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_volumes_free_smoke_textures(void); void EEVEE_volumes_free(void); /* eevee_effects.c */ -void EEVEE_effects_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_effects_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_effects_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_effects_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_create_minmax_buffer(EEVEE_Data *vedata, struct GPUTexture *depth_src, int layer); void EEVEE_downsample_buffer(EEVEE_Data *vedata, struct GPUFrameBuffer *fb_src, struct GPUTexture *texture_src, int level); void EEVEE_downsample_cube_buffer(EEVEE_Data *vedata, struct GPUFrameBuffer *fb_src, struct GPUTexture *texture_src, int level); -void EEVEE_effects_do_gtao(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata); +void EEVEE_effects_do_gtao(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_draw_effects(EEVEE_Data *vedata); void EEVEE_effects_free(void); diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c index 27d4eb0b44a..35669968337 100644 --- a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c +++ b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c @@ -98,7 +98,7 @@ static struct GPUShader *eevee_effects_screen_raytrace_shader_get(int options) return e_data.ssr_sh[options]; } -int EEVEE_screen_raytrace_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +int EEVEE_screen_raytrace_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_StorageList *stl = vedata->stl; EEVEE_FramebufferList *fbl = vedata->fbl; @@ -107,8 +107,8 @@ int EEVEE_screen_raytrace_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data const float *viewport_size = DRW_viewport_size_get(); const DRWContextState *draw_ctx = DRW_context_state_get(); - SceneLayer *scene_layer = draw_ctx->scene_layer; - IDProperty *props = BKE_scene_layer_engine_evaluated_get(scene_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); + ViewLayer *view_layer = draw_ctx->view_layer; + IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); /* Compute pixel size, (shared with contact shadows) */ copy_v2_v2(effects->ssr_pixelsize, viewport_size); @@ -180,7 +180,7 @@ int EEVEE_screen_raytrace_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data return 0; } -void EEVEE_screen_raytrace_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata) +void EEVEE_screen_raytrace_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_StorageList *stl = vedata->stl; @@ -271,7 +271,7 @@ void EEVEE_screen_raytrace_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data * } } -void EEVEE_refraction_compute(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +void EEVEE_refraction_compute(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_FramebufferList *fbl = vedata->fbl; EEVEE_TextureList *txl = vedata->txl; @@ -288,7 +288,7 @@ void EEVEE_refraction_compute(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data * } } -void EEVEE_reflection_compute(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +void EEVEE_reflection_compute(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_FramebufferList *fbl = vedata->fbl; diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c b/source/blender/draw/engines/eevee/eevee_subsurface.c index fe6e77ddf29..d96d7b6a983 100644 --- a/source/blender/draw/engines/eevee/eevee_subsurface.c +++ b/source/blender/draw/engines/eevee/eevee_subsurface.c @@ -44,7 +44,7 @@ static void eevee_create_shader_subsurface(void) e_data.sss_sh[1] = DRW_shader_create_fullscreen(datatoc_effect_subsurface_frag_glsl, "#define SECOND_PASS\n"); } -int EEVEE_subsurface_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +int EEVEE_subsurface_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_StorageList *stl = vedata->stl; EEVEE_EffectsInfo *effects = stl->effects; @@ -53,8 +53,8 @@ int EEVEE_subsurface_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *veda const float *viewport_size = DRW_viewport_size_get(); const DRWContextState *draw_ctx = DRW_context_state_get(); - SceneLayer *scene_layer = draw_ctx->scene_layer; - IDProperty *props = BKE_scene_layer_engine_evaluated_get(scene_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); + ViewLayer *view_layer = draw_ctx->view_layer; + IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); if (BKE_collection_engine_property_value_get_bool(props, "sss_enable")) { effects->sss_sample_count = 1 + BKE_collection_engine_property_value_get_int(props, "sss_samples") * 2; @@ -92,7 +92,7 @@ int EEVEE_subsurface_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *veda return 0; } -void EEVEE_subsurface_cache_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +void EEVEE_subsurface_cache_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_StorageList *stl = vedata->stl; @@ -138,7 +138,7 @@ void EEVEE_subsurface_add_pass(EEVEE_Data *vedata, unsigned int sss_id, struct G DRW_shgroup_call_add(grp, quad, NULL); } -void EEVEE_subsurface_data_render(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +void EEVEE_subsurface_data_render(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_TextureList *txl = vedata->txl; @@ -187,7 +187,7 @@ void EEVEE_subsurface_data_render(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Da } } -void EEVEE_subsurface_compute(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +void EEVEE_subsurface_compute(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_FramebufferList *fbl = vedata->fbl; diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c index d5580c21a1f..72b8c85b7a7 100644 --- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c +++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c @@ -44,7 +44,7 @@ static void eevee_create_shader_temporal_sampling(void) e_data.taa_resolve_sh = DRW_shader_create_fullscreen(datatoc_effect_temporal_aa_glsl, NULL); } -int EEVEE_temporal_sampling_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +int EEVEE_temporal_sampling_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_StorageList *stl = vedata->stl; EEVEE_FramebufferList *fbl = vedata->fbl; @@ -52,8 +52,8 @@ int EEVEE_temporal_sampling_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Dat EEVEE_EffectsInfo *effects = stl->effects; const DRWContextState *draw_ctx = DRW_context_state_get(); - SceneLayer *scene_layer = draw_ctx->scene_layer; - IDProperty *props = BKE_scene_layer_engine_evaluated_get(scene_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); + ViewLayer *view_layer = draw_ctx->view_layer; + IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); if (BKE_collection_engine_property_value_get_int(props, "taa_samples") != 1 && /* FIXME the motion blur camera evaluation is tagging view_updated @@ -134,7 +134,7 @@ int EEVEE_temporal_sampling_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Dat return 0; } -void EEVEE_temporal_sampling_cache_init(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +void EEVEE_temporal_sampling_cache_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_StorageList *stl = vedata->stl; diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index f789d304f2b..14383e28cc7 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -119,7 +119,7 @@ static void eevee_create_shader_volumes(void) e_data.volumetric_common_lib, NULL); } -int EEVEE_volumes_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata) +int EEVEE_volumes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) { EEVEE_StorageList *stl = vedata->stl; EEVEE_FramebufferList *fbl = vedata->fbl; @@ -127,8 +127,8 @@ int EEVEE_volumes_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata) EEVEE_EffectsInfo *effects = stl->effects; const DRWContextState *draw_ctx = DRW_context_state_get(); - SceneLayer *scene_layer = draw_ctx->scene_layer; - IDProperty *props = BKE_scene_layer_engine_evaluated_get(scene_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); + ViewLayer *view_layer = draw_ctx->view_layer; + IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE); const float *viewport_size = DRW_viewport_size_get(); @@ -326,7 +326,7 @@ int EEVEE_volumes_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata) return 0; } -void EEVEE_volumes_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata) +void EEVEE_volumes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_StorageList *stl = vedata->stl; @@ -437,7 +437,7 @@ void EEVEE_volumes_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata) } } -void EEVEE_volumes_cache_object_add(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata, Scene *scene, Object *ob) +void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, Scene *scene, Object *ob) { float *texcoloc = NULL; float *texcosize = NULL; @@ -498,7 +498,7 @@ void EEVEE_volumes_cache_object_add(EEVEE_SceneLayerData *sldata, EEVEE_Data *ve } } -void EEVEE_volumes_compute(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +void EEVEE_volumes_compute(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_TextureList *txl = vedata->txl; @@ -533,7 +533,7 @@ void EEVEE_volumes_compute(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *ved } } -void EEVEE_volumes_resolve(EEVEE_SceneLayerData *UNUSED(sldata), EEVEE_Data *vedata) +void EEVEE_volumes_resolve(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_TextureList *txl = vedata->txl; diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 2bb957c8e43..8d89454fa6a 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -382,8 +382,8 @@ struct DefaultTextureList *DRW_viewport_texture_list_get(void); void DRW_viewport_request_redraw(void); -/* SceneLayers */ -void **DRW_scene_layer_engine_data_get(DrawEngineType *engine_type, void (*callback)(void *storage)); +/* ViewLayers */ +void **DRW_view_layer_engine_data_get(DrawEngineType *engine_type, void (*callback)(void *storage)); /* Objects */ void **DRW_object_engine_data_get( @@ -438,7 +438,7 @@ typedef struct DRWContextState { struct View3D *v3d; /* 'CTX_wm_view3d(C)' */ struct Scene *scene; /* 'CTX_data_scene(C)' */ - struct SceneLayer *scene_layer; /* 'CTX_data_scene_layer(C)' */ + struct ViewLayer *view_layer; /* 'CTX_data_view_layer(C)' */ /* Use 'scene->obedit' for edit-mode */ struct Object *obact; /* 'OBACT' */ diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c index 90a50110698..58cf3aaf6cc 100644 --- a/source/blender/draw/intern/draw_armature.c +++ b/source/blender/draw/intern/draw_armature.c @@ -1413,11 +1413,11 @@ static void DRW_shgroup_armature( } void DRW_shgroup_armature_object( - Object *ob, SceneLayer *scene_layer, DRWPass *pass_bone_solid, DRWPass *pass_bone_wire, DRWPass *UNUSED(pass_bone_envelope), + Object *ob, ViewLayer *view_layer, DRWPass *pass_bone_solid, DRWPass *pass_bone_wire, DRWPass *UNUSED(pass_bone_envelope), DRWShadingGroup *shgrp_relationship_lines) { float *color; - DRW_object_wire_theme_get(ob, scene_layer, &color); + DRW_object_wire_theme_get(ob, view_layer, &color); DRW_shgroup_armature(ob, pass_bone_solid, pass_bone_wire, NULL, shgrp_relationship_lines); draw_armature_pose(ob, color); diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index bb7b4d7d513..b52c8e280b3 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -373,10 +373,10 @@ DRWShadingGroup *shgroup_instance_mball_helpers(DRWPass *pass, struct Gwn_Batch * Get the wire color theme_id of an object based on it's state * \a r_color is a way to get a pointer to the static color var associated */ -int DRW_object_wire_theme_get(Object *ob, SceneLayer *scene_layer, float **r_color) +int DRW_object_wire_theme_get(Object *ob, ViewLayer *view_layer, float **r_color) { const bool is_edit = (ob->mode & OB_MODE_EDIT) != 0; - const bool active = (scene_layer->basact && scene_layer->basact->object == ob); + const bool active = (view_layer->basact && view_layer->basact->object == ob); /* confusing logic here, there are 2 methods of setting the color * 'colortab[colindex]' and 'theme_id', colindex overrides theme_id. * diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h index 51b7a25490f..0bdb79b3a40 100644 --- a/source/blender/draw/intern/draw_common.h +++ b/source/blender/draw/intern/draw_common.h @@ -30,7 +30,7 @@ struct DRWPass; struct DRWShadingGroup; struct Gwn_Batch; struct Object; -struct SceneLayer; +struct ViewLayer; /* Used as ubo but colors can be directly referenced as well */ /* Keep in sync with: common_globals_lib.glsl (globalsBlock) */ @@ -106,12 +106,12 @@ struct DRWShadingGroup *shgroup_instance_bone_envelope_wire(struct DRWPass *pass struct DRWShadingGroup *shgroup_instance_bone_envelope_solid(struct DRWPass *pass, struct Gwn_Batch *geom, float (*obmat)[4]); struct DRWShadingGroup *shgroup_instance_mball_helpers(struct DRWPass *pass, struct Gwn_Batch *geom); -int DRW_object_wire_theme_get(struct Object *ob, struct SceneLayer *scene_layer, float **r_color); +int DRW_object_wire_theme_get(struct Object *ob, struct ViewLayer *view_layer, float **r_color); float *DRW_color_background_blend_get(int theme_id); /* draw_armature.c */ void DRW_shgroup_armature_object( - struct Object *ob, struct SceneLayer *scene_layer, + struct Object *ob, struct ViewLayer *view_layer, struct DRWPass *pass_bone_solid, struct DRWPass *pass_bone_wire, struct DRWPass *pass_bone_envelope, struct DRWShadingGroup *shgrp_relationship_lines); diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 672149b9e43..1e0061bc29c 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -2699,23 +2699,23 @@ void DRW_viewport_request_redraw(void) /* -------------------------------------------------------------------- */ -/** \name SceneLayers (DRW_scenelayer) +/** \name ViewLayers (DRW_scenelayer) * \{ */ -void **DRW_scene_layer_engine_data_get(DrawEngineType *engine_type, void (*callback)(void *storage)) +void **DRW_view_layer_engine_data_get(DrawEngineType *engine_type, void (*callback)(void *storage)) { - SceneLayerEngineData *sled; + ViewLayerEngineData *sled; - for (sled = DST.draw_ctx.scene_layer->drawdata.first; sled; sled = sled->next) { + for (sled = DST.draw_ctx.view_layer->drawdata.first; sled; sled = sled->next) { if (sled->engine_type == engine_type) { return &sled->storage; } } - sled = MEM_callocN(sizeof(SceneLayerEngineData), "SceneLayerEngineData"); + sled = MEM_callocN(sizeof(ViewLayerEngineData), "ViewLayerEngineData"); sled->engine_type = engine_type; sled->free = callback; - BLI_addtail(&DST.draw_ctx.scene_layer->drawdata, sled); + BLI_addtail(&DST.draw_ctx.view_layer->drawdata, sled); return &sled->storage; } @@ -3062,9 +3062,9 @@ static void DRW_engines_enable_external(void) use_drw_engine(DRW_engine_viewport_external_type.draw_engine); } -static void DRW_engines_enable(const Scene *scene, SceneLayer *scene_layer, RenderEngineType *engine) +static void DRW_engines_enable(const Scene *scene, ViewLayer *view_layer, RenderEngineType *engine) { - Object *obact = OBACT(scene_layer); + Object *obact = OBACT(view_layer); const int mode = CTX_data_mode_enum_ex(scene->obedit, obact); DRW_engines_enable_from_engine(engine); @@ -3227,7 +3227,7 @@ void DRW_notify_view_update(const bContext *C) RegionView3D *rv3d = ar->regiondata; Scene *scene = DEG_get_evaluated_scene(graph); RenderEngineType *engine = CTX_data_engine(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); if (rv3d->viewport == NULL) { return; @@ -3239,10 +3239,10 @@ void DRW_notify_view_update(const bContext *C) DST.viewport = rv3d->viewport; DST.draw_ctx = (DRWContextState){ - ar, rv3d, v3d, scene, scene_layer, OBACT(scene_layer), engine, C, + ar, rv3d, v3d, scene, view_layer, OBACT(view_layer), engine, C, }; - DRW_engines_enable(scene, scene_layer, engine); + DRW_engines_enable(scene, view_layer, engine); for (LinkData *link = DST.enabled_engines.first; link; link = link->next) { DrawEngineType *draw_engine = link->data; @@ -3291,7 +3291,7 @@ void DRW_draw_render_loop_ex( const bContext *evil_C) { Scene *scene = DEG_get_evaluated_scene(graph); - SceneLayer *scene_layer = DEG_get_evaluated_scene_layer(graph); + ViewLayer *view_layer = DEG_get_evaluated_view_layer(graph); RegionView3D *rv3d = ar->regiondata; DST.draw_ctx.evil_C = evil_C; @@ -3303,7 +3303,7 @@ void DRW_draw_render_loop_ex( GPU_viewport_engines_data_validate(DST.viewport, DRW_engines_get_hash()); DST.draw_ctx = (DRWContextState){ - ar, rv3d, v3d, scene, scene_layer, OBACT(scene_layer), engine, + ar, rv3d, v3d, scene, view_layer, OBACT(view_layer), engine, /* reuse if caller sets */ DST.draw_ctx.evil_C, @@ -3312,7 +3312,7 @@ void DRW_draw_render_loop_ex( DRW_viewport_var_init(); /* Get list of enabled engines */ - DRW_engines_enable(scene, scene_layer, engine); + DRW_engines_enable(scene, view_layer, engine); /* Update ubos */ DRW_globals_update(); @@ -3466,9 +3466,9 @@ void DRW_draw_select_loop( { Scene *scene = DEG_get_evaluated_scene(graph); RenderEngineType *engine = RE_engines_find(scene->view_render.engine_id); - SceneLayer *scene_layer = DEG_get_evaluated_scene_layer(graph); + ViewLayer *view_layer = DEG_get_evaluated_view_layer(graph); #ifndef USE_GPU_SELECT - UNUSED_VARS(vc, scene, scene_layer, v3d, ar, rect); + UNUSED_VARS(vc, scene, view_layer, v3d, ar, rect); #else RegionView3D *rv3d = ar->regiondata; @@ -3517,7 +3517,7 @@ void DRW_draw_select_loop( /* Instead of 'DRW_context_state_init(C, &DST.draw_ctx)', assign from args */ DST.draw_ctx = (DRWContextState){ - ar, rv3d, v3d, scene, scene_layer, OBACT(scene_layer), engine, (bContext *)NULL, + ar, rv3d, v3d, scene, view_layer, OBACT(view_layer), engine, (bContext *)NULL, }; DRW_viewport_var_init(); @@ -3584,7 +3584,7 @@ void DRW_draw_depth_loop( { Scene *scene = DEG_get_evaluated_scene(graph); RenderEngineType *engine = RE_engines_find(scene->view_render.engine_id); - SceneLayer *scene_layer = DEG_get_evaluated_scene_layer(graph); + ViewLayer *view_layer = DEG_get_evaluated_view_layer(graph); RegionView3D *rv3d = ar->regiondata; /* backup (_never_ use rv3d->viewport) */ @@ -3614,7 +3614,7 @@ void DRW_draw_depth_loop( /* Instead of 'DRW_context_state_init(C, &DST.draw_ctx)', assign from args */ DST.draw_ctx = (DRWContextState){ - ar, rv3d, v3d, scene, scene_layer, OBACT(scene_layer), engine, (bContext *)NULL, + ar, rv3d, v3d, scene, view_layer, OBACT(view_layer), engine, (bContext *)NULL, }; DRW_viewport_var_init(); diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c index 8ed51fcd7f6..474d6ac8769 100644 --- a/source/blender/draw/intern/draw_view.c +++ b/source/blender/draw/intern/draw_view.c @@ -611,9 +611,9 @@ void DRW_draw_background(void) /* **************************** 3D Cursor ******************************** */ -static bool is_cursor_visible(Scene *scene, SceneLayer *scene_layer) +static bool is_cursor_visible(Scene *scene, ViewLayer *view_layer) { - Object *ob = OBACT(scene_layer); + Object *ob = OBACT(view_layer); /* don't draw cursor in paint modes, but with a few exceptions */ if (ob && ob->mode & OB_MODE_ALL_PAINT) { @@ -625,7 +625,7 @@ static bool is_cursor_visible(Scene *scene, SceneLayer *scene_layer) } /* exception: object in texture paint mode, clone brush, use_clone_layer disabled */ else if (ob->mode & OB_MODE_TEXTURE_PAINT) { - const Paint *p = BKE_paint_get_active(scene, scene_layer); + const Paint *p = BKE_paint_get_active(scene, view_layer); if (p && p->brush && p->brush->imagepaint_tool == PAINT_TOOL_CLONE) { if ((scene->toolsettings->imapaint.flag & IMAGEPAINT_PROJECT_LAYER_CLONE) == 0) { @@ -647,14 +647,14 @@ void DRW_draw_cursor(void) View3D *v3d = draw_ctx->v3d; RegionView3D *rv3d = draw_ctx->rv3d; Scene *scene = draw_ctx->scene; - SceneLayer *scene_layer = draw_ctx->scene_layer; + ViewLayer *view_layer = draw_ctx->view_layer; glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); glDepthMask(GL_FALSE); glDisable(GL_DEPTH_TEST); glLineWidth(1.0f); - if (is_cursor_visible(scene, scene_layer)) { + if (is_cursor_visible(scene, view_layer)) { float *co = ED_view3d_cursor3d_get(scene, v3d); unsigned char crosshair_color[3]; diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 534ef9fb5bd..a1bb12aec25 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -1089,12 +1089,12 @@ static void OBJECT_cache_init(void *vedata) } } -static void DRW_shgroup_mball_helpers(OBJECT_StorageList *stl, Object *ob, SceneLayer *scene_layer) +static void DRW_shgroup_mball_helpers(OBJECT_StorageList *stl, Object *ob, ViewLayer *view_layer) { MetaBall *mb = ob->data; float *color; - DRW_object_wire_theme_get(ob, scene_layer, &color); + DRW_object_wire_theme_get(ob, view_layer, &color); for (MetaElem *ml = mb->elems.first; ml != NULL; ml = ml->next) { /* draw radius */ @@ -1103,11 +1103,11 @@ static void DRW_shgroup_mball_helpers(OBJECT_StorageList *stl, Object *ob, Scene } } -static void DRW_shgroup_lamp(OBJECT_StorageList *stl, Object *ob, SceneLayer *scene_layer) +static void DRW_shgroup_lamp(OBJECT_StorageList *stl, Object *ob, ViewLayer *view_layer) { Lamp *la = ob->data; float *color; - int theme_id = DRW_object_wire_theme_get(ob, scene_layer, &color); + int theme_id = DRW_object_wire_theme_get(ob, view_layer, &color); static float zero = 0.0f; float **la_mats = (float **)DRW_object_engine_data_get(ob, &draw_engine_object_type, NULL); @@ -1208,7 +1208,7 @@ static void DRW_shgroup_lamp(OBJECT_StorageList *stl, Object *ob, SceneLayer *sc DRW_shgroup_call_dynamic_add(stl->g_data->lamp_groundpoint, ob->obmat[3]); } -static void DRW_shgroup_camera(OBJECT_StorageList *stl, Object *ob, SceneLayer *scene_layer) +static void DRW_shgroup_camera(OBJECT_StorageList *stl, Object *ob, ViewLayer *view_layer) { const DRWContextState *draw_ctx = DRW_context_state_get(); View3D *v3d = draw_ctx->v3d; @@ -1217,7 +1217,7 @@ static void DRW_shgroup_camera(OBJECT_StorageList *stl, Object *ob, SceneLayer * Camera *cam = ob->data; const bool is_active = (ob == v3d->camera); float *color; - DRW_object_wire_theme_get(ob, scene_layer, &color); + DRW_object_wire_theme_get(ob, view_layer, &color); float vec[4][3], asp[2], shift[2], scale[3], drawsize; @@ -1294,10 +1294,10 @@ static void DRW_shgroup_camera(OBJECT_StorageList *stl, Object *ob, SceneLayer * } } -static void DRW_shgroup_empty(OBJECT_StorageList *stl, OBJECT_PassList *psl, Object *ob, SceneLayer *scene_layer) +static void DRW_shgroup_empty(OBJECT_StorageList *stl, OBJECT_PassList *psl, Object *ob, ViewLayer *view_layer) { float *color; - DRW_object_wire_theme_get(ob, scene_layer, &color); + DRW_object_wire_theme_get(ob, view_layer, &color); switch (ob->empty_drawtype) { case OB_PLAINAXES: @@ -1329,9 +1329,9 @@ static void DRW_shgroup_empty(OBJECT_StorageList *stl, OBJECT_PassList *psl, Obj } } -static void DRW_shgroup_forcefield(OBJECT_StorageList *stl, Object *ob, SceneLayer *scene_layer) +static void DRW_shgroup_forcefield(OBJECT_StorageList *stl, Object *ob, ViewLayer *view_layer) { - int theme_id = DRW_object_wire_theme_get(ob, scene_layer, NULL); + int theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL); float *color = DRW_color_background_blend_get(theme_id); PartDeflect *pd = ob->pd; Curve *cu = (ob->type == OB_CURVE) ? ob->data : NULL; @@ -1428,11 +1428,11 @@ static void DRW_shgroup_forcefield(OBJECT_StorageList *stl, Object *ob, SceneLay } } -static void DRW_shgroup_speaker(OBJECT_StorageList *stl, Object *ob, SceneLayer *scene_layer) +static void DRW_shgroup_speaker(OBJECT_StorageList *stl, Object *ob, ViewLayer *view_layer) { float *color; static float one = 1.0f; - DRW_object_wire_theme_get(ob, scene_layer, &color); + DRW_object_wire_theme_get(ob, view_layer, &color); DRW_shgroup_call_dynamic_add(stl->g_data->speaker, color, &one, ob->obmat); } @@ -1447,13 +1447,13 @@ typedef struct OBJECT_LightProbeEngineData { float corner[3]; } OBJECT_LightProbeEngineData; -static void DRW_shgroup_lightprobe(OBJECT_StorageList *stl, OBJECT_PassList *psl, Object *ob, SceneLayer *scene_layer) +static void DRW_shgroup_lightprobe(OBJECT_StorageList *stl, OBJECT_PassList *psl, Object *ob, ViewLayer *view_layer) { float *color; static float one = 1.0f; LightProbe *prb = (LightProbe *)ob->data; bool do_outlines = ((ob->base_flag & BASE_SELECTED) != 0); - DRW_object_wire_theme_get(ob, scene_layer, &color); + DRW_object_wire_theme_get(ob, view_layer, &color); OBJECT_LightProbeEngineData *prb_data; OBJECT_LightProbeEngineData **prb_data_pt = (OBJECT_LightProbeEngineData **)DRW_object_engine_data_get(ob, &draw_engine_object_type, NULL); @@ -1654,12 +1654,12 @@ static void DRW_shgroup_relationship_lines(OBJECT_StorageList *stl, Object *ob) } } -static void DRW_shgroup_object_center(OBJECT_StorageList *stl, Object *ob, SceneLayer *scene_layer, View3D *v3d) +static void DRW_shgroup_object_center(OBJECT_StorageList *stl, Object *ob, ViewLayer *view_layer, View3D *v3d) { const bool is_library = ob->id.us > 1 || ID_IS_LINKED(ob); DRWShadingGroup *shgroup; - if (ob == OBACT(scene_layer)) { + if (ob == OBACT(view_layer)) { shgroup = stl->g_data->center_active; } else if (ob->base_flag & BASE_SELECTED) { @@ -1759,7 +1759,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) OBJECT_StorageList *stl = ((OBJECT_Data *)vedata)->stl; const DRWContextState *draw_ctx = DRW_context_state_get(); Scene *scene = draw_ctx->scene; - SceneLayer *scene_layer = draw_ctx->scene_layer; + ViewLayer *view_layer = draw_ctx->view_layer; View3D *v3d = draw_ctx->v3d; int theme_id = TH_UNDEFINED; @@ -1777,7 +1777,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) if (ob != obedit && !((ob == draw_ctx->obact) && (ob->mode & OB_MODE_ALL_PAINT))) { struct Gwn_Batch *geom = DRW_cache_object_surface_get(ob); if (geom) { - theme_id = DRW_object_wire_theme_get(ob, scene_layer, NULL); + theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL); DRWShadingGroup *shgroup = shgroup_theme_id_to_outline_or(stl, theme_id, NULL); if (shgroup != NULL) { DRW_shgroup_call_add(shgroup, geom, ob->obmat); @@ -1796,7 +1796,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) struct Gwn_Batch *geom = DRW_cache_mesh_edges_get(ob); if (geom) { if (theme_id == TH_UNDEFINED) { - theme_id = DRW_object_wire_theme_get(ob, scene_layer, NULL); + theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL); } DRWShadingGroup *shgroup = shgroup_theme_id_to_wire_or(stl, theme_id, stl->g_data->wire); @@ -1816,7 +1816,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) if (ob != obedit) { struct Gwn_Batch *geom = DRW_cache_lattice_wire_get(ob, false); if (theme_id == TH_UNDEFINED) { - theme_id = DRW_object_wire_theme_get(ob, scene_layer, NULL); + theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL); } DRWShadingGroup *shgroup = shgroup_theme_id_to_wire_or(stl, theme_id, stl->g_data->wire); @@ -1831,7 +1831,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) if (ob != obedit) { struct Gwn_Batch *geom = DRW_cache_curve_edge_wire_get(ob); if (theme_id == TH_UNDEFINED) { - theme_id = DRW_object_wire_theme_get(ob, scene_layer, NULL); + theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL); } DRWShadingGroup *shgroup = shgroup_theme_id_to_wire_or(stl, theme_id, stl->g_data->wire); DRW_shgroup_call_add(shgroup, geom, ob->obmat); @@ -1842,24 +1842,24 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) { Object *obedit = scene->obedit; if (ob != obedit) { - DRW_shgroup_mball_helpers(stl, ob, scene_layer); + DRW_shgroup_mball_helpers(stl, ob, view_layer); } break; } case OB_LAMP: - DRW_shgroup_lamp(stl, ob, scene_layer); + DRW_shgroup_lamp(stl, ob, view_layer); break; case OB_CAMERA: - DRW_shgroup_camera(stl, ob, scene_layer); + DRW_shgroup_camera(stl, ob, view_layer); break; case OB_EMPTY: - DRW_shgroup_empty(stl, psl, ob, scene_layer); + DRW_shgroup_empty(stl, psl, ob, view_layer); break; case OB_SPEAKER: - DRW_shgroup_speaker(stl, ob, scene_layer); + DRW_shgroup_speaker(stl, ob, view_layer); break; case OB_LIGHTPROBE: - DRW_shgroup_lightprobe(stl, psl, ob, scene_layer); + DRW_shgroup_lightprobe(stl, psl, ob, view_layer); break; case OB_ARMATURE: { @@ -1867,7 +1867,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) if (arm->edbo == NULL) { if (DRW_state_is_select() || !DRW_pose_mode_armature(ob, draw_ctx->obact)) { DRW_shgroup_armature_object( - ob, scene_layer, psl->bone_solid, psl->bone_wire, psl->bone_envelope, + ob, view_layer, psl->bone_solid, psl->bone_wire, psl->bone_envelope, stl->g_data->relationship_lines); } } @@ -1878,20 +1878,20 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) } if (ob->pd && ob->pd->forcefield) { - DRW_shgroup_forcefield(stl, ob, scene_layer); + DRW_shgroup_forcefield(stl, ob, view_layer); } /* don't show object extras in set's */ if ((ob->base_flag & (BASE_FROM_SET | BASE_FROMDUPLI)) == 0) { - DRW_shgroup_object_center(stl, ob, scene_layer, v3d); + DRW_shgroup_object_center(stl, ob, view_layer, v3d); DRW_shgroup_relationship_lines(stl, ob); if ((ob->dtx & OB_DRAWNAME) && DRW_state_show_text()) { struct DRWTextStore *dt = DRW_text_cache_ensure(); if (theme_id == TH_UNDEFINED) { - theme_id = DRW_object_wire_theme_get(ob, scene_layer, NULL); + theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL); } unsigned char color[4]; diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 80a388408a5..0db465e583b 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -2684,7 +2684,7 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index, { bDopeSheet *ads = (bDopeSheet *)ac->data; Scene *sce = (Scene *)ads->source; - SceneLayer *scene_layer = ac->scene_layer; + ViewLayer *view_layer = ac->view_layer; Base *base = (Base *)ale->data; Object *ob = base->object; AnimData *adt = ob->adt; @@ -2703,7 +2703,7 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index, /* deselect all */ /* TODO: should this deselect all other types of channels too? */ - for (b = scene_layer->object_bases.first; b; b = b->next) { + for (b = view_layer->object_bases.first; b; b = b->next) { ED_object_base_select(b, BA_DESELECT); BKE_scene_object_base_flag_sync_from_base(b); if (b->object->adt) b->object->adt->flag &= ~(ADT_UI_SELECTED | ADT_UI_ACTIVE); diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index f5eadeab92a..e13371b942b 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -132,7 +132,7 @@ static void animedit_get_yscale_factor(bAnimContext *ac) /* Note: there's a similar function in key.c (BKE_key_from_object) */ static Key *actedit_get_shapekeys(bAnimContext *ac) { - SceneLayer *sl = ac->scene_layer; + ViewLayer *sl = ac->view_layer; Object *ob; Key *key; @@ -381,8 +381,8 @@ bool ANIM_animdata_get_context(const bContext *C, bAnimContext *ac) if (scene) { ac->markers = ED_context_get_markers(C); } - ac->scene_layer = CTX_data_scene_layer(C); - ac->obact = (ac->scene_layer->basact) ? ac->scene_layer->basact->object : NULL; + ac->view_layer = CTX_data_view_layer(C); + ac->obact = (ac->view_layer->basact) ? ac->view_layer->basact->object : NULL; ac->sa = sa; ac->ar = ar; ac->sl = sl; @@ -1686,7 +1686,7 @@ static size_t animdata_filter_gpencil(bAnimContext *ac, ListBase *anim_data, voi if (ads->filterflag & ADS_FILTER_GP_3DONLY) { Scene *scene = (Scene *)ads->source; - SceneLayer *sl = (SceneLayer *)ac->scene_layer; + ViewLayer *sl = (ViewLayer *)ac->view_layer; Base *base; /* Active scene's GPencil block first - No parent item needed... */ @@ -1958,26 +1958,26 @@ static size_t animdata_filter_ds_nodetree(bAnimContext *ac, ListBase *anim_data, static size_t animdata_filter_ds_linestyle(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, Scene *sce, int filter_mode) { - SceneLayer *scene_layer; + ViewLayer *view_layer; FreestyleLineSet *lineset; size_t items = 0; - for (scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - for (lineset = scene_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) { + for (view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) { + for (lineset = view_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) { if (lineset->linestyle) { lineset->linestyle->id.tag |= LIB_TAG_DOIT; } } } - for (scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next) { + for (view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) { /* skip render layers without Freestyle enabled */ - if ((scene_layer->flag & SCENE_LAYER_FREESTYLE) == 0) { + if ((view_layer->flag & VIEW_LAYER_FREESTYLE) == 0) { continue; } /* loop over linesets defined in the render layer */ - for (lineset = scene_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) { + for (lineset = view_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) { FreestyleLineStyle *linestyle = lineset->linestyle; ListBase tmp_data = {NULL, NULL}; size_t tmp_items = 0; @@ -2941,7 +2941,7 @@ static int ds_base_sorting_cmp(const void *base1_ptr, const void *base2_ptr) } /* Get a sorted list of all the bases - for inclusion in dopesheet (when drawing channels) */ -static Base **animdata_filter_ds_sorted_bases(bDopeSheet *ads, SceneLayer *sl, int filter_mode, size_t *r_usable_bases) +static Base **animdata_filter_ds_sorted_bases(bDopeSheet *ads, ViewLayer *sl, int filter_mode, size_t *r_usable_bases) { /* Create an array with space for all the bases, but only containing the usable ones */ size_t tot_bases = BLI_listbase_count(&sl->object_bases); @@ -2967,7 +2967,7 @@ static Base **animdata_filter_ds_sorted_bases(bDopeSheet *ads, SceneLayer *sl, i static size_t animdata_filter_dopesheet(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, int filter_mode) { Scene *scene = (Scene *)ads->source; - SceneLayer *sl = (SceneLayer *)ac->scene_layer; + ViewLayer *sl = (ViewLayer *)ac->view_layer; size_t items = 0; /* check that we do indeed have a scene */ diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index a5965336e12..107a46999f0 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -1146,13 +1146,13 @@ static int ed_marker_select(bContext *C, const wmEvent *event, bool extend, bool if (camera) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Base *base; TimeMarker *marker; int sel = 0; if (!extend) - BKE_scene_layer_base_deselect_all(scene_layer); + BKE_view_layer_base_deselect_all(view_layer); for (marker = markers->first; marker; marker = marker->next) { if (marker->frame == cfra) { @@ -1164,7 +1164,7 @@ static int ed_marker_select(bContext *C, const wmEvent *event, bool extend, bool for (marker = markers->first; marker; marker = marker->next) { if (marker->camera) { if (marker->frame == cfra) { - base = BKE_scene_layer_base_find(scene_layer, marker->camera); + base = BKE_view_layer_base_find(view_layer, marker->camera); if (base) { ED_object_base_select(base, sel); if (sel) diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index 0705d17882c..03fecc77d40 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -582,7 +582,7 @@ static int separate_armature_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *obedit = CTX_data_edit_object(C); Object *oldob, *newob; Base *oldbase, *newbase; diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c index 2c3c8ef4541..e32324d25f9 100644 --- a/source/blender/editors/armature/armature_select.c +++ b/source/blender/editors/armature/armature_select.c @@ -184,7 +184,7 @@ void *get_nearest_bone(bContext *C, const int xy[2], bool findunsel) hits = view3d_opengl_select(&eval_ctx, &vc, buffer, MAXPICKBUF, &rect, VIEW3D_SELECT_PICK_NEAREST); if (hits > 0) - return get_bone_from_selectbuffer(vc.scene, vc.scene_layer->basact, buffer, hits, findunsel, true); + return get_bone_from_selectbuffer(vc.scene, vc.view_layer->basact, buffer, hits, findunsel, true); return NULL; } diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index 1de7b99c6d2..2027aabc936 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -147,7 +147,7 @@ static RigGraph *TEMPLATE_RIGG = NULL; void BIF_makeListTemplates(const bContext *C) { Object *obedit = CTX_data_edit_object(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); ToolSettings *ts = CTX_data_tool_settings(C); int index = 0; @@ -998,7 +998,7 @@ static int sk_getStrokeSnapPoint(bContext *C, SK_Point *pt, SK_Sketch *sketch, S * the ideal would be to call this function only at the beginning of the snap operation, * or at the beginning of the operator itself */ struct SnapObjectContext *snap_context = ED_transform_snap_object_context_create_view3d( - CTX_data_main(C), CTX_data_scene(C), CTX_data_scene_layer(C), CTX_data_engine(C), 0, + CTX_data_main(C), CTX_data_scene(C), CTX_data_view_layer(C), CTX_data_engine(C), 0, CTX_wm_region(C), CTX_wm_view3d(C)); float mvalf[2] = {UNPACK2(dd->mval)}; diff --git a/source/blender/editors/armature/pose_select.c b/source/blender/editors/armature/pose_select.c index ba01aab0d00..0cb2ded4bae 100644 --- a/source/blender/editors/armature/pose_select.c +++ b/source/blender/editors/armature/pose_select.c @@ -134,7 +134,7 @@ void ED_pose_bone_select(Object *ob, bPoseChannel *pchan, bool select) /* called from editview.c, for mode-less pose selection */ /* assumes scene obact and basact is still on old situation */ bool ED_do_pose_selectbuffer( - Scene *scene, SceneLayer *sl, Base *base, const unsigned int *buffer, short hits, + Scene *scene, ViewLayer *sl, Base *base, const unsigned int *buffer, short hits, bool extend, bool deselect, bool toggle, bool do_nearest) { Object *ob = base->object; diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 7666fc15209..2faceaa454d 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -1288,7 +1288,7 @@ static int separate_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *oldob, *newob; Base *oldbase, *newbase; Curve *oldcu, *newcu; @@ -5020,7 +5020,7 @@ static int add_vertex_invoke(bContext *C, wmOperator *op, const wmEvent *event) const float mval[2] = {UNPACK2(event->mval)}; struct SnapObjectContext *snap_context = ED_transform_snap_object_context_create_view3d( - CTX_data_main(C), vc.scene, vc.scene_layer, vc.engine, 0, + CTX_data_main(C), vc.scene, vc.view_layer, vc.engine, 0, vc.ar, vc.v3d); ED_transform_snap_object_project_view3d_mixed( diff --git a/source/blender/editors/curve/editcurve_paint.c b/source/blender/editors/curve/editcurve_paint.c index a1b73a54e3d..5a71cc39f80 100644 --- a/source/blender/editors/curve/editcurve_paint.c +++ b/source/blender/editors/curve/editcurve_paint.c @@ -614,7 +614,7 @@ static bool curve_draw_init(bContext *C, wmOperator *op, bool is_invoke) else { cdd->vc.depsgraph = CTX_data_depsgraph(C); cdd->vc.scene = CTX_data_scene(C); - cdd->vc.scene_layer = CTX_data_scene_layer(C); + cdd->vc.view_layer = CTX_data_view_layer(C); cdd->vc.obedit = CTX_data_edit_object(C); } diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index f5a0b225974..915684e6ca5 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -423,7 +423,7 @@ static void txt_add_object(bContext *C, TextLine *firstline, int totline, const { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); EvaluationContext eval_ctx; Curve *cu; Object *obedit; diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index 5d38ab2340a..1674091f138 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -1671,7 +1671,7 @@ void ED_gpencil_draw_view2d(const bContext *C, bool onlyv2d) * second time with only3d=false for screen-aligned strokes */ void ED_gpencil_draw_view3d(wmWindowManager *wm, Scene *scene, - SceneLayer *scene_layer, + ViewLayer *view_layer, View3D *v3d, ARegion *ar, bool only3d) @@ -1681,7 +1681,7 @@ void ED_gpencil_draw_view3d(wmWindowManager *wm, int offsx, offsy, winx, winy; /* check that we have grease-pencil stuff to draw */ - bGPdata *gpd = ED_gpencil_data_get_active_v3d(scene, scene_layer); + bGPdata *gpd = ED_gpencil_data_get_active_v3d(scene, view_layer); if (gpd == NULL) return; /* when rendering to the offscreen buffer we don't want to diff --git a/source/blender/editors/gpencil/gpencil_convert.c b/source/blender/editors/gpencil/gpencil_convert.c index 5d014b5d49e..df08c914756 100644 --- a/source/blender/editors/gpencil/gpencil_convert.c +++ b/source/blender/editors/gpencil/gpencil_convert.c @@ -1125,7 +1125,7 @@ static void gp_layer_to_curve(bContext *C, ReportList *reports, bGPdata *gpd, bG { struct Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); SceneCollection *sc = CTX_data_scene_collection(C); bGPDframe *gpf = BKE_gpencil_layer_getframe(gpl, CFRA, 0); bGPDstroke *gps, *prev_gps = NULL; @@ -1157,7 +1157,7 @@ static void gp_layer_to_curve(bContext *C, ReportList *reports, bGPdata *gpd, bG ob = BKE_object_add_only_object(bmain, OB_CURVE, gpl->info); cu = ob->data = BKE_curve_add(bmain, gpl->info, OB_CURVE); BKE_collection_object_add(scene, sc, ob); - base_new = BKE_scene_layer_base_find(sl, ob); + base_new = BKE_view_layer_base_find(sl, ob); cu->flag |= CU_3D; diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 96c929e9a92..e1e4f850039 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -204,9 +204,9 @@ bGPdata *ED_gpencil_data_get_active(const bContext *C) /* -------------------------------------------------------- */ // XXX: this should be removed... We really shouldn't duplicate logic like this! -bGPdata *ED_gpencil_data_get_active_v3d(Scene *scene, SceneLayer *scene_layer) +bGPdata *ED_gpencil_data_get_active_v3d(Scene *scene, ViewLayer *view_layer) { - Base *base = scene_layer->basact; + Base *base = view_layer->basact; bGPdata *gpd = NULL; /* We have to make sure active object is actually visible and selected, else we must use default scene gpd, * to be consistent with ED_gpencil_data_get_active's behavior. diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 77b2ce435c2..db141a2ee29 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -82,7 +82,7 @@ typedef struct bAnimContext { struct bDopeSheet *ads; /* dopesheet data for editor (or which is being used) */ struct Scene *scene; /* active scene */ - struct SceneLayer *scene_layer; /* active scene layer */ + struct ViewLayer *view_layer; /* active scene layer */ struct Object *obact; /* active object */ ListBase *markers; /* active set of markers */ diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index 918e96d8408..0fb90e67dd4 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -47,7 +47,7 @@ struct DerivedMesh; struct Object; struct ReportList; struct Scene; -struct SceneLayer; +struct ViewLayer; struct ViewContext; struct wmKeyConfig; struct wmOperator; @@ -143,7 +143,7 @@ void ED_armature_deselect_all(struct Object *obedit); void ED_armature_deselect_all_visible(struct Object *obedit); bool ED_do_pose_selectbuffer( - struct Scene *scene, struct SceneLayer *sl, struct Base *base, const unsigned int *buffer, short hits, + struct Scene *scene, struct ViewLayer *sl, struct Base *base, const unsigned int *buffer, short hits, bool extend, bool deselect, bool toggle, bool do_nearest); bool ED_armature_select_pick(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle); int join_armature_exec(struct bContext *C, struct wmOperator *op); diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h index 926f31781e2..7e384e0056b 100644 --- a/source/blender/editors/include/ED_gpencil.h +++ b/source/blender/editors/include/ED_gpencil.h @@ -49,7 +49,7 @@ struct bAnimContext; struct KeyframeEditData; struct PointerRNA; struct Scene; -struct SceneLayer; +struct ViewLayer; struct wmWindowManager; struct wmKeyConfig; @@ -115,7 +115,7 @@ struct bGPdata *ED_gpencil_data_get_active_direct(struct ID *screen_id, struct S struct ScrArea *sa, struct Object *ob); /* 3D View */ -struct bGPdata *ED_gpencil_data_get_active_v3d(struct Scene *scene, struct SceneLayer *scene_layer); +struct bGPdata *ED_gpencil_data_get_active_v3d(struct Scene *scene, struct ViewLayer *view_layer); bool ED_gpencil_has_keyframe_v3d(struct Scene *scene, struct Object *ob, int cfra); @@ -151,7 +151,7 @@ void ED_gpencil_draw_2dimage(const struct bContext *C); void ED_gpencil_draw_view2d(const struct bContext *C, bool onlyv2d); void ED_gpencil_draw_view3d(struct wmWindowManager *wm, struct Scene *scene, - struct SceneLayer *scene_layer, + struct ViewLayer *view_layer, struct View3D *v3d, struct ARegion *ar, bool only3d); diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h index 00e58785373..a149d0d4adc 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.h @@ -39,7 +39,7 @@ struct ToolSettings; struct wmWindowManager; struct ARegion; struct Scene; -struct SceneLayer; +struct ViewLayer; /* image_edit.c, exported for transform */ struct Image *ED_space_image(struct SpaceImage *sima); @@ -75,7 +75,7 @@ bool ED_space_image_show_uvedit(struct SpaceImage *sima, struct Object *obedit); bool ED_space_image_paint_curve(const struct bContext *C); -bool ED_space_image_check_show_maskedit(struct SceneLayer *sl, struct SpaceImage *sima); +bool ED_space_image_check_show_maskedit(struct ViewLayer *sl, struct SpaceImage *sima); int ED_space_image_maskedit_poll(struct bContext *C); int ED_space_image_maskedit_mask_poll(struct bContext *C); diff --git a/source/blender/editors/include/ED_info.h b/source/blender/editors/include/ED_info.h index fe570fef83d..b5d2337034b 100644 --- a/source/blender/editors/include/ED_info.h +++ b/source/blender/editors/include/ED_info.h @@ -28,7 +28,7 @@ #define __ED_INFO_H__ /* info_stats.c */ -void ED_info_stats_clear(struct SceneLayer *sl); -const char *ED_info_stats_string(struct Scene *scene, struct SceneLayer *sl); +void ED_info_stats_clear(struct ViewLayer *sl); +const char *ED_info_stats_string(struct Scene *scene, struct ViewLayer *sl); #endif /* __ED_INFO_H__ */ diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 1e5ba378d7d..1c519aee757 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -44,7 +44,7 @@ struct ModifierData; struct Object; struct ReportList; struct Scene; -struct SceneLayer; +struct ViewLayer; struct bConstraint; struct bContext; struct bPoseChannel; @@ -109,7 +109,7 @@ void ED_object_base_activate(struct bContext *C, struct Base *base); void ED_object_base_free_and_unlink(struct Main *bmain, struct Scene *scene, struct Object *ob); /* single object duplicate, if (dupflag == 0), fully linked, else it uses the flags given */ -struct Base *ED_object_add_duplicate(struct Main *bmain, struct Scene *scene, struct SceneLayer *sl, struct Base *base, int dupflag); +struct Base *ED_object_add_duplicate(struct Main *bmain, struct Scene *scene, struct ViewLayer *sl, struct Base *base, int dupflag); void ED_object_parent(struct Object *ob, struct Object *parent, const int type, const char *substr); @@ -195,7 +195,7 @@ void ED_object_modifier_clear(struct Main *bmain, struct Object *ob); int ED_object_modifier_move_down(struct ReportList *reports, struct Object *ob, struct ModifierData *md); int ED_object_modifier_move_up(struct ReportList *reports, struct Object *ob, struct ModifierData *md); int ED_object_modifier_convert(struct ReportList *reports, struct Main *bmain, struct Scene *scene, - struct SceneLayer *sl, struct Object *ob, struct ModifierData *md); + struct ViewLayer *sl, struct Object *ob, struct ModifierData *md); int ED_object_modifier_apply(struct ReportList *reports, const struct bContext *C, struct Scene *scene, struct Object *ob, struct ModifierData *md, int mode); int ED_object_modifier_copy(struct ReportList *reports, struct Object *ob, struct ModifierData *md); diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h index f8bd8a22897..bffc36397b0 100644 --- a/source/blender/editors/include/ED_particle.h +++ b/source/blender/editors/include/ED_particle.h @@ -38,24 +38,24 @@ struct ParticleEditSettings; struct rcti; struct PTCacheEdit; struct Scene; -struct SceneLayer; +struct ViewLayer; /* particle edit mode */ void PE_free_ptcache_edit(struct PTCacheEdit *edit); int PE_start_edit(struct PTCacheEdit *edit); /* access */ -struct PTCacheEdit *PE_get_current(struct Scene *scene, struct SceneLayer *sl, struct Object *ob); +struct PTCacheEdit *PE_get_current(struct Scene *scene, struct ViewLayer *sl, struct Object *ob); struct PTCacheEdit *PE_create_current(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob); void PE_current_changed(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob); -int PE_minmax(struct Scene *scene, struct SceneLayer *sl, float min[3], float max[3]); +int PE_minmax(struct Scene *scene, struct ViewLayer *sl, float min[3], float max[3]); struct ParticleEditSettings *PE_settings(struct Scene *scene); /* update calls */ void PE_hide_keys_time(struct Scene *scene, struct PTCacheEdit *edit, float cfra); void PE_update_object( const struct EvaluationContext *eval_ctx, struct Scene *scene, - struct SceneLayer *sl, struct Object *ob, int useflag); + struct ViewLayer *sl, struct Object *ob, int useflag); /* selection tools */ int PE_mouse_particles(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle); @@ -65,13 +65,13 @@ int PE_lasso_select(struct bContext *C, const int mcords[][2], const short moves void PE_deselect_all_visible(struct PTCacheEdit *edit); /* undo */ -void PE_undo_push(struct Scene *scene, struct SceneLayer *sl, const char *str); -void PE_undo_step(struct Scene *scene, struct SceneLayer *sl, int step); -void PE_undo(struct Scene *scene, struct SceneLayer *sl); -void PE_redo(struct Scene *scene, struct SceneLayer *sl); -bool PE_undo_is_valid(struct Scene *scene, struct SceneLayer *sl); -void PE_undo_number(struct Scene *scene, struct SceneLayer *sl, int nr); -const char *PE_undo_get_name(struct Scene *scene, struct SceneLayer *sl, int nr, bool *r_active); +void PE_undo_push(struct Scene *scene, struct ViewLayer *sl, const char *str); +void PE_undo_step(struct Scene *scene, struct ViewLayer *sl, int step); +void PE_undo(struct Scene *scene, struct ViewLayer *sl); +void PE_redo(struct Scene *scene, struct ViewLayer *sl); +bool PE_undo_is_valid(struct Scene *scene, struct ViewLayer *sl); +void PE_undo_number(struct Scene *scene, struct ViewLayer *sl, int nr); +const char *PE_undo_get_name(struct Scene *scene, struct ViewLayer *sl, int nr, bool *r_active); #endif /* __ED_PARTICLE_H__ */ diff --git a/source/blender/editors/include/ED_scene.h b/source/blender/editors/include/ED_scene.h index 6a4ebf68d3d..647a8dda1b9 100644 --- a/source/blender/editors/include/ED_scene.h +++ b/source/blender/editors/include/ED_scene.h @@ -34,8 +34,8 @@ bool ED_scene_delete(struct bContext *C, struct Main *bmain, struct wmWindow *wi void ED_scene_exit(struct bContext *C) ATTR_NONNULL(); void ED_scene_changed_update(struct Main *bmain, struct bContext *C, struct Scene *scene_new, const struct bScreen *active_screen) ATTR_NONNULL(); -bool ED_scene_render_layer_delete( - struct Main *bmain, struct Scene *scene, struct SceneLayer *layer, +bool ED_scene_view_layer_delete( + struct Main *bmain, struct Scene *scene, struct ViewLayer *layer, struct ReportList *reports) ATTR_NONNULL(1, 2, 3); void ED_operatortypes_scene(void); diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h index 51f1f38a9e9..c1655cbccc2 100644 --- a/source/blender/editors/include/ED_screen.h +++ b/source/blender/editors/include/ED_screen.h @@ -49,7 +49,7 @@ struct WorkSpace; struct WorkSpaceInstanceHook; struct bContext; struct Scene; -struct SceneLayer; +struct ViewLayer; struct bScreen; struct ARegion; struct uiBlock; @@ -117,7 +117,7 @@ bool ED_screen_change(struct bContext *C, struct bScreen *sc); void ED_screen_update_after_scene_change( const struct bScreen *screen, struct Scene *scene_new, - struct SceneLayer *scene_layer); + struct ViewLayer *view_layer); void ED_screen_set_subwinactive(struct bContext *C, const struct wmEvent *event); void ED_screen_exit(struct bContext *C, struct wmWindow *window, struct bScreen *screen); void ED_screen_animation_timer(struct bContext *C, int redraws, int refresh, int sync, int enable); @@ -136,7 +136,7 @@ void ED_screen_preview_render(const struct bScreen *screen, int size_x, int s struct WorkSpace *ED_workspace_add( struct Main *bmain, const char *name, - SceneLayer *act_render_layer, + ViewLayer *act_render_layer, struct ViewRender *view_render) ATTR_NONNULL(); bool ED_workspace_change( struct WorkSpace *workspace_new, @@ -151,8 +151,8 @@ bool ED_workspace_delete( struct wmWindowManager *wm) ATTR_NONNULL(); void ED_workspace_scene_data_sync( struct WorkSpaceInstanceHook *hook, Scene *scene) ATTR_NONNULL(); -void ED_workspace_render_layer_unset( - const struct Main *bmain, const SceneLayer *layer_unset, SceneLayer *layer_new) ATTR_NONNULL(1, 2); +void ED_workspace_view_layer_unset( + const struct Main *bmain, const ViewLayer *layer_unset, ViewLayer *layer_new) ATTR_NONNULL(1, 2); struct WorkSpaceLayout *ED_workspace_layout_add( struct WorkSpace *workspace, struct wmWindow *win, @@ -168,7 +168,7 @@ bool ED_workspace_layout_cycle( struct bContext *C) ATTR_NONNULL(); /* anim */ -void ED_update_for_newframe(struct Main *bmain, struct Scene *scene, struct SceneLayer *scene_layer, struct Depsgraph *depsgraph); +void ED_update_for_newframe(struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer, struct Depsgraph *depsgraph); void ED_refresh_viewport_fps(struct bContext *C); int ED_screen_animation_play(struct bContext *C, int sync, int mode); diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.h index 2639130acc0..a882b707436 100644 --- a/source/blender/editors/include/ED_transform_snap_object_context.h +++ b/source/blender/editors/include/ED_transform_snap_object_context.h @@ -32,7 +32,7 @@ struct BMFace; struct ListBase; struct RenderEngineType; struct Scene; -struct SceneLayer; +struct ViewLayer; struct Main; struct Object; struct ARegion; @@ -76,9 +76,9 @@ struct SnapObjectParams { typedef struct SnapObjectContext SnapObjectContext; SnapObjectContext *ED_transform_snap_object_context_create( - struct Main *bmain, struct Scene *scene, struct SceneLayer *sl, struct RenderEngineType *engine, int flag); + struct Main *bmain, struct Scene *scene, struct ViewLayer *sl, struct RenderEngineType *engine, int flag); SnapObjectContext *ED_transform_snap_object_context_create_view3d( - struct Main *bmain, struct Scene *scene, struct SceneLayer *sl, struct RenderEngineType *engine, int flag, + struct Main *bmain, struct Scene *scene, struct ViewLayer *sl, struct RenderEngineType *engine, int flag, /* extra args for view3d */ const struct ARegion *ar, const struct View3D *v3d); void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx); diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index 641cc523873..5a8854cc4de 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -41,7 +41,7 @@ struct ImageUser; struct Main; struct Object; struct Scene; -struct SceneLayer; +struct ViewLayer; struct SpaceImage; struct bNode; struct wmKeyConfig; @@ -112,7 +112,7 @@ void ED_unwrap_lscm(struct Scene *scene, struct Object *obedit, const short sel) /* uvedit_draw.c */ void ED_image_draw_cursor(struct ARegion *ar, const float cursor[2]); -void ED_uvedit_draw_main(struct SpaceImage *sima, struct ARegion *ar, struct Scene *scene, struct SceneLayer *sl, struct Object *obedit, struct Object *obact, struct Depsgraph *depsgraph); +void ED_uvedit_draw_main(struct SpaceImage *sima, struct ARegion *ar, struct Scene *scene, struct ViewLayer *sl, struct Object *obedit, struct Object *obact, struct Depsgraph *depsgraph); /* uvedit_buttons.c */ void ED_uvedit_buttons_register(struct ARegionType *art); diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 8116a1ba456..5b78b89f505 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -54,7 +54,7 @@ struct RV3DMatrixStore; struct RegionView3D; struct RenderEngineType; struct Scene; -struct SceneLayer; +struct ViewLayer; struct ScrArea; struct View3D; struct ViewContext; @@ -77,7 +77,7 @@ enum eGPUFXFlags; typedef struct ViewContext { struct Depsgraph *depsgraph; struct Scene *scene; - struct SceneLayer *scene_layer; + struct ViewLayer *view_layer; struct RenderEngineType *engine; struct Object *obact; struct Object *obedit; @@ -364,7 +364,7 @@ void ED_view3d_check_mats_rv3d(struct RegionView3D *rv3d); # define ED_view3d_clear_mats_rv3d(rv3d) (void)(rv3d) # define ED_view3d_check_mats_rv3d(rv3d) (void)(rv3d) #endif -int ED_view3d_scene_layer_set(int lay, const int *values, int *active); +int ED_view3d_view_layer_set(int lay, const int *values, int *active); struct RV3DMatrixStore *ED_view3d_mats_rv3d_backup(struct RegionView3D *rv3d); void ED_view3d_mats_rv3d_restore(struct RegionView3D *rv3d, struct RV3DMatrixStore *rv3dmat); @@ -374,10 +374,10 @@ void ED_draw_object_facemap(const struct EvaluationContext *eval_ctx, struct Sc bool ED_view3d_context_activate(struct bContext *C); void ED_view3d_draw_offscreen_init( const struct EvaluationContext *eval_ctx, struct Scene *scene, - struct SceneLayer *sl, struct View3D *v3d); + struct ViewLayer *sl, struct View3D *v3d); void ED_view3d_draw_offscreen( const struct EvaluationContext *eval_ctx, struct Scene *scene, - struct SceneLayer *scene_layer, struct View3D *v3d, struct ARegion *ar, int winx, int winy, float viewmat[4][4], + struct ViewLayer *view_layer, struct View3D *v3d, struct ARegion *ar, int winx, int winy, float viewmat[4][4], float winmat[4][4], bool do_bgpic, bool do_sky, bool is_persp, const char *viewname, struct GPUFX *fx, struct GPUFXSettings *fx_settings, struct GPUOffScreen *ofs); @@ -387,13 +387,13 @@ void ED_view3d_draw_setup_view( struct ImBuf *ED_view3d_draw_offscreen_imbuf( const struct EvaluationContext *eval_ctx, struct Scene *scene, - struct SceneLayer *scene_layer, struct View3D *v3d, struct ARegion *ar, + struct ViewLayer *view_layer, struct View3D *v3d, struct ARegion *ar, int sizex, int sizey, unsigned int flag, bool draw_background, int alpha_mode, int samples, bool full_samples, const char *viewname, struct GPUFX *fx, struct GPUOffScreen *ofs, char err_out[256]); struct ImBuf *ED_view3d_draw_offscreen_imbuf_simple( const struct EvaluationContext *eval_ctx, struct Scene *scene, - struct SceneLayer *scene_layer, struct Object *camera, int width, int height, + struct ViewLayer *view_layer, struct Object *camera, int width, int height, unsigned int flag, int drawtype, bool use_solid_tex, bool use_gpencil, bool draw_background, int alpha_mode, int samples, bool full_samples, const char *viewname, struct GPUFX *fx, struct GPUOffScreen *ofs, char err_out[256]); diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 2947365fc5d..b880ed5e679 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -5215,7 +5215,7 @@ static int ui_do_but_COLOR( if (!event->ctrl) { float color[3]; Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Paint *paint = BKE_paint_get_active(scene, sl); Brush *brush = BKE_paint_brush(paint); @@ -6124,7 +6124,7 @@ static int ui_do_but_CURVE( int mx, my, a; bool changed = false; Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); mx = event->x; my = event->y; diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 9e79ca5b0e3..fc227a2aa75 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -163,7 +163,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op) export_count = collada_export(&eval_ctx, CTX_data_scene(C), - CTX_data_scene_layer(C), + CTX_data_view_layer(C), filepath, apply_modifiers, export_mesh_type, diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index cee9ee90b24..9c3d1c11b24 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -309,7 +309,7 @@ void EMBM_project_snap_verts(bContext *C, ARegion *ar, BMEditMesh *em) ED_view3d_init_mats_rv3d(obedit, ar->regiondata); struct SnapObjectContext *snap_context = ED_transform_snap_object_context_create_view3d( - CTX_data_main(C), CTX_data_scene(C), CTX_data_scene_layer(C), CTX_data_engine(C), 0, + CTX_data_main(C), CTX_data_scene(C), CTX_data_view_layer(C), CTX_data_engine(C), 0, ar, CTX_wm_view3d(C)); BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { @@ -3017,7 +3017,7 @@ enum { MESH_SEPARATE_LOOSE = 2, }; -static Base *mesh_separate_tagged(Main *bmain, Scene *scene, SceneLayer *sl, Base *base_old, BMesh *bm_old) +static Base *mesh_separate_tagged(Main *bmain, Scene *scene, ViewLayer *sl, Base *base_old, BMesh *bm_old) { Base *base_new; Object *obedit = base_old->object; @@ -3064,7 +3064,7 @@ static Base *mesh_separate_tagged(Main *bmain, Scene *scene, SceneLayer *sl, Bas return base_new; } -static bool mesh_separate_selected(Main *bmain, Scene *scene, SceneLayer *sl, Base *base_old, BMesh *bm_old) +static bool mesh_separate_selected(Main *bmain, Scene *scene, ViewLayer *sl, Base *base_old, BMesh *bm_old) { /* we may have tags from previous operators */ BM_mesh_elem_hflag_disable_all(bm_old, BM_FACE | BM_EDGE | BM_VERT, BM_ELEM_TAG, false); @@ -3171,7 +3171,7 @@ static void mesh_separate_material_assign_mat_nr(Main *bmain, Object *ob, const } } -static bool mesh_separate_material(Main *bmain, Scene *scene, SceneLayer *sl, Base *base_old, BMesh *bm_old) +static bool mesh_separate_material(Main *bmain, Scene *scene, ViewLayer *sl, Base *base_old, BMesh *bm_old) { BMFace *f_cmp, *f; BMIter iter; @@ -3223,7 +3223,7 @@ static bool mesh_separate_material(Main *bmain, Scene *scene, SceneLayer *sl, Ba return result; } -static bool mesh_separate_loose(Main *bmain, Scene *scene, SceneLayer *sl, Base *base_old, BMesh *bm_old) +static bool mesh_separate_loose(Main *bmain, Scene *scene, ViewLayer *sl, Base *base_old, BMesh *bm_old) { int i; BMEdge *e; @@ -3286,7 +3286,7 @@ static int edbm_separate_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); const int type = RNA_enum_get(op->ptr, "type"); int retval = 0; diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c index a340e23efc5..d7e59a05772 100644 --- a/source/blender/editors/mesh/mesh_navmesh.c +++ b/source/blender/editors/mesh/mesh_navmesh.c @@ -338,7 +338,7 @@ static Object *createRepresentation(bContext *C, struct recast_polyMesh *pmesh, int i, j, k; unsigned short *v; int face[3]; - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Object *obedit; int createob = base == NULL; int nverts, nmeshes, nvp; @@ -356,8 +356,8 @@ static Object *createRepresentation(bContext *C, struct recast_polyMesh *pmesh, } else { obedit = base->object; - BKE_scene_layer_base_deselect_all(scene_layer); - BKE_scene_layer_base_select(scene_layer, base); + BKE_view_layer_base_deselect_all(view_layer); + BKE_view_layer_base_select(view_layer, base); copy_v3_v3(obedit->loc, co); copy_v3_v3(obedit->rot, rot); } @@ -466,7 +466,7 @@ static Object *createRepresentation(bContext *C, struct recast_polyMesh *pmesh, static int navmesh_create_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); LinkNode *obs = NULL; Base *navmeshBase = NULL; @@ -474,7 +474,7 @@ static int navmesh_create_exec(bContext *C, wmOperator *op) { if (base->object->type == OB_MESH) { if (base->object->body_type == OB_BODY_TYPE_NAVMESH) { - if (!navmeshBase || base == scene_layer->basact) { + if (!navmeshBase || base == view_layer->basact) { navmeshBase = base; } } diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index ea2c688daa3..016c0e75331 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -428,7 +428,7 @@ Object *ED_object_add_type( { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob; /* for as long scene has editmode... */ @@ -1426,7 +1426,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base, const bool use_hierarchy) { Main *bmain = CTX_data_main(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); ListBase *lb_duplis; DupliObject *dob; GHash *dupli_gh, *parent_gh = NULL; @@ -1460,7 +1460,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base, } BKE_collection_object_add_from(scene, base->object, ob_dst); - base_dst = BKE_scene_layer_base_find(sl, ob_dst); + base_dst = BKE_view_layer_base_find(sl, ob_dst); BLI_assert(base_dst != NULL); BKE_scene_object_base_flag_sync_from_base(base_dst); @@ -1674,7 +1674,7 @@ static int convert_poll(bContext *C) } /* Helper for convert_exec */ -static Base *duplibase_for_convert(Main *bmain, Scene *scene, SceneLayer *sl, Base *base, Object *ob) +static Base *duplibase_for_convert(Main *bmain, Scene *scene, ViewLayer *sl, Base *base, Object *ob) { Object *obn; Base *basen; @@ -1687,7 +1687,7 @@ static Base *duplibase_for_convert(Main *bmain, Scene *scene, SceneLayer *sl, Ba DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); BKE_collection_object_add_from(scene, ob, obn); - basen = BKE_scene_layer_base_find(sl, obn); + basen = BKE_view_layer_base_find(sl, obn); ED_object_base_select(basen, BA_SELECT); ED_object_base_select(basen, BA_DESELECT); return basen; @@ -1697,7 +1697,7 @@ static int convert_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); EvaluationContext eval_ctx; Base *basen = NULL, *basact = NULL; Object *ob1, *newob, *obact = CTX_data_active_object(C); @@ -1762,10 +1762,10 @@ static int convert_exec(bContext *C, wmOperator *op) DEG_id_tag_update(&base->object->id, OB_RECALC_DATA); } - Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, sl, true); + Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true); uint64_t customdata_mask_prev = scene->customdata_mask; scene->customdata_mask |= CD_MASK_MESH; - BKE_scene_graph_update_tagged(bmain->eval_ctx, depsgraph, bmain, scene, sl); + BKE_scene_graph_update_tagged(bmain->eval_ctx, depsgraph, bmain, scene, view_layer); scene->customdata_mask = customdata_mask_prev; } @@ -1792,7 +1792,7 @@ static int convert_exec(bContext *C, wmOperator *op) ob->flag |= OB_DONE; if (keep_original) { - basen = duplibase_for_convert(bmain, scene, sl, base, NULL); + basen = duplibase_for_convert(bmain, scene, view_layer, base, NULL); newob = basen->object; /* decrement original mesh's usage count */ @@ -1817,7 +1817,7 @@ static int convert_exec(bContext *C, wmOperator *op) ob->flag |= OB_DONE; if (keep_original) { - basen = duplibase_for_convert(bmain, scene, sl, base, NULL); + basen = duplibase_for_convert(bmain, scene, view_layer, base, NULL); newob = basen->object; /* decrement original mesh's usage count */ @@ -1848,7 +1848,7 @@ static int convert_exec(bContext *C, wmOperator *op) ob->flag |= OB_DONE; if (keep_original) { - basen = duplibase_for_convert(bmain, scene, sl, base, NULL); + basen = duplibase_for_convert(bmain, scene, view_layer, base, NULL); newob = basen->object; /* decrement original curve's usage count */ @@ -1919,7 +1919,7 @@ static int convert_exec(bContext *C, wmOperator *op) if (target == OB_MESH) { if (keep_original) { - basen = duplibase_for_convert(bmain, scene, sl, base, NULL); + basen = duplibase_for_convert(bmain, scene, view_layer, base, NULL); newob = basen->object; /* decrement original curve's usage count */ @@ -1954,7 +1954,7 @@ static int convert_exec(bContext *C, wmOperator *op) if (!(baseob->flag & OB_DONE)) { baseob->flag |= OB_DONE; - basen = duplibase_for_convert(bmain, scene, sl, base, baseob); + basen = duplibase_for_convert(bmain, scene, view_layer, base, baseob); newob = basen->object; mb = newob->data; @@ -2031,11 +2031,11 @@ static int convert_exec(bContext *C, wmOperator *op) if (basact) { /* active base was changed */ ED_object_base_activate(C, basact); - BASACT(sl) = basact; + BASACT(view_layer) = basact; } - else if (BASACT(sl)->object->flag & OB_DONE) { - WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, BASACT(sl)->object); - WM_event_add_notifier(C, NC_OBJECT | ND_DATA, BASACT(sl)->object); + else if (BASACT(view_layer)->object->flag & OB_DONE) { + WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, BASACT(view_layer)->object); + WM_event_add_notifier(C, NC_OBJECT | ND_DATA, BASACT(view_layer)->object); } DEG_relations_tag_update(bmain); @@ -2077,7 +2077,7 @@ void OBJECT_OT_convert(wmOperatorType *ot) /* used below, assumes id.new is correct */ /* leaves selection of base/object unaltered */ /* Does set ID->newid pointers. */ -static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, SceneLayer *sl, Object *ob, int dupflag) +static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, ViewLayer *sl, Object *ob, int dupflag) { #define ID_NEW_REMAP_US(a) if ( (a)->id.newid) { (a) = (void *)(a)->id.newid; (a)->id.us++; } #define ID_NEW_REMAP_US2(a) if (((ID *)a)->newid) { (a) = ((ID *)a)->newid; ((ID *)a)->us++; } @@ -2096,7 +2096,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, SceneLayer DEG_id_tag_update(&obn->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); BKE_collection_object_add_from(scene, ob, obn); - basen = BKE_scene_layer_base_find(sl, obn); + basen = BKE_view_layer_base_find(sl, obn); /* 1) duplis should end up in same group as the original * 2) Rigid Body sim participants MUST always be part of a group... @@ -2319,7 +2319,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, SceneLayer * note: don't call this within a loop since clear_* funcs loop over the entire database. * note: caller must do DAG_relations_tag_update(bmain); * this is not done automatic since we may duplicate many objects in a batch */ -Base *ED_object_add_duplicate(Main *bmain, Scene *scene, SceneLayer *sl, Base *base, int dupflag) +Base *ED_object_add_duplicate(Main *bmain, Scene *scene, ViewLayer *sl, Base *base, int dupflag) { Base *basen; Object *ob; @@ -2353,7 +2353,7 @@ static int duplicate_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); const bool linked = RNA_boolean_get(op->ptr, "linked"); int dupflag = (linked) ? 0 : U.dupflag; @@ -2425,7 +2425,7 @@ static int add_named_exec(bContext *C, wmOperator *op) const wmEvent *event = win ? win->eventstate : NULL; Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Base *basen; Object *ob; const bool linked = RNA_boolean_get(op->ptr, "linked"); diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index 0fd1d32c8b8..c8fafd3e521 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -616,7 +616,7 @@ static int test_bake_internal(bContext *C, ReportList *reports) static void init_bake_internal(BakeRender *bkr, bContext *C) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); bScreen *sc = CTX_wm_screen(C); /* get editmode results */ @@ -838,7 +838,7 @@ static int bake_image_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); int result = OPERATOR_CANCELLED; if (is_multires_bake(scene)) { diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 80fd44be364..05a5f652382 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -1688,15 +1688,15 @@ static bool get_new_constraint_target(bContext *C, int con_type, Object **tar_ob if ((found == false) && (add)) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); - Base *base = BASACT(sl), *newbase = NULL; + ViewLayer *view_layer = CTX_data_view_layer(C); + Base *base = BASACT(view_layer), *newbase = NULL; Object *obt; /* add new target object */ - obt = BKE_object_add(bmain, scene, sl, OB_EMPTY, NULL); + obt = BKE_object_add(bmain, scene, view_layer, OB_EMPTY, NULL); /* set layers OK */ - newbase = BASACT(sl); + newbase = BASACT(view_layer); newbase->lay = base->lay; obt->lay = newbase->lay; @@ -1715,7 +1715,7 @@ static bool get_new_constraint_target(bContext *C, int con_type, Object **tar_ob } /* restore, BKE_object_add sets active */ - BASACT(sl) = base; + BASACT(view_layer) = base; base->flag |= BASE_SELECTED; /* make our new target the new object */ diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index eaf42d4a53c..b5283da490a 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -235,7 +235,7 @@ void ED_object_editmode_exit(bContext *C, int flag) /* Note! only in exceptional cases should 'EM_DO_UNDO' NOT be in the flag */ /* Note! if 'EM_FREEDATA' isn't in the flag, use ED_object_editmode_load directly */ Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *obedit = CTX_data_edit_object(C); const bool freedata = (flag & EM_FREEDATA) != 0; @@ -290,7 +290,7 @@ void ED_object_editmode_exit(bContext *C, int flag) void ED_object_editmode_enter(bContext *C, int flag) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob; bool ok = false; @@ -512,7 +512,7 @@ void OBJECT_OT_posemode_toggle(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } -static void copymenu_properties(SceneLayer *sl, Object *ob) +static void copymenu_properties(ViewLayer *sl, Object *ob) { //XXX no longer used - to be removed - replaced by game_properties_copy_exec bProperty *prop; @@ -573,7 +573,7 @@ static void copymenu_properties(SceneLayer *sl, Object *ob) } -static void copymenu_logicbricks(SceneLayer *sl, Object *ob) +static void copymenu_logicbricks(ViewLayer *sl, Object *ob) { //XXX no longer used - to be removed - replaced by logicbricks_copy_exec Base *base; @@ -659,7 +659,7 @@ static void copy_texture_space(Object *to, Object *ob) } /* UNUSED, keep in case we want to copy functionality for use elsewhere */ -static void copy_attr(Main *bmain, Scene *scene, SceneLayer *sl, short event) +static void copy_attr(Main *bmain, Scene *scene, ViewLayer *sl, short event) { Object *ob; Base *base; @@ -910,7 +910,7 @@ static void copy_attr(Main *bmain, Scene *scene, SceneLayer *sl, short event) DEG_relations_tag_update(bmain); } -static void UNUSED_FUNCTION(copy_attr_menu) (Main *bmain, Scene *scene, SceneLayer *sl) +static void UNUSED_FUNCTION(copy_attr_menu) (Main *bmain, Scene *scene, ViewLayer *sl) { Object *ob; short event; @@ -1334,7 +1334,7 @@ void OBJECT_OT_shade_smooth(wmOperatorType *ot) /* ********************** */ -static void UNUSED_FUNCTION(image_aspect) (Scene *scene, SceneLayer *sl) +static void UNUSED_FUNCTION(image_aspect) (Scene *scene, ViewLayer *sl) { /* all selected objects with an image map: scale in image aspect */ Base *base; diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c index 27c1a03190a..da392b9ad99 100644 --- a/source/blender/editors/object/object_group.c +++ b/source/blender/editors/object/object_group.c @@ -200,7 +200,7 @@ void GROUP_OT_objects_add_active(wmOperatorType *ot) static int objects_remove_active_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = OBACT(sl); int single_group_index = RNA_enum_get(op->ptr, "group"); Group *single_group = group_object_active_find_index(ob, single_group_index); diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 3f6651299be..f806e3757d2 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -448,14 +448,14 @@ static int hook_op_edit_poll(bContext *C) return 0; } -static Object *add_hook_object_new(Main *bmain, Scene *scene, SceneLayer *sl, Object *obedit) +static Object *add_hook_object_new(Main *bmain, Scene *scene, ViewLayer *sl, Object *obedit) { Base *base, *basedit; Object *ob; ob = BKE_object_add(bmain, scene, sl, OB_EMPTY, NULL); - basedit = BKE_scene_layer_base_find(sl, obedit); + basedit = BKE_view_layer_base_find(sl, obedit); base = sl->basact; base->lay = ob->lay = obedit->lay; BLI_assert(sl->basact->object == ob); @@ -467,7 +467,7 @@ static Object *add_hook_object_new(Main *bmain, Scene *scene, SceneLayer *sl, Ob return ob; } -static int add_hook_object(const bContext *C, Main *bmain, Scene *scene, SceneLayer *sl, Object *obedit, Object *ob, int mode, ReportList *reports) +static int add_hook_object(const bContext *C, Main *bmain, Scene *scene, ViewLayer *sl, Object *obedit, Object *ob, int mode, ReportList *reports) { ModifierData *md = NULL; HookModifierData *hmd = NULL; @@ -562,7 +562,7 @@ static int object_add_hook_selob_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *obedit = CTX_data_edit_object(C); Object *obsel = NULL; const bool use_bone = RNA_boolean_get(op->ptr, "use_bone"); @@ -618,7 +618,7 @@ static int object_add_hook_newob_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *obedit = CTX_data_edit_object(C); if (add_hook_object(C, bmain, scene, sl, obedit, NULL, OBJECT_ADDHOOK_NEWOB, op->reports)) { diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index a498e8a1564..b0bfe4fb09f 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -413,7 +413,7 @@ int ED_object_modifier_move_down(ReportList *reports, Object *ob, ModifierData * return 1; } -int ED_object_modifier_convert(ReportList *UNUSED(reports), Main *bmain, Scene *scene, SceneLayer *sl, Object *ob, ModifierData *md) +int ED_object_modifier_convert(ReportList *UNUSED(reports), Main *bmain, Scene *scene, ViewLayer *sl, Object *ob, ModifierData *md) { Object *obn; ParticleSystem *psys; @@ -882,7 +882,7 @@ ModifierData *edit_modifier_property_get(wmOperator *op, Object *ob, int type) static int modifier_remove_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = ED_object_active_context(C); ModifierData *md = edit_modifier_property_get(op, ob, 0); int mode_orig = ob->mode; @@ -1058,7 +1058,7 @@ static int modifier_convert_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = ED_object_active_context(C); ModifierData *md = edit_modifier_property_get(op, ob, 0); @@ -1698,7 +1698,7 @@ static void skin_armature_bone_create(Object *skin_ob, } } -static Object *modifier_skin_armature_create(const bContext *C, Scene *scene, SceneLayer *sl, Object *skin_ob) +static Object *modifier_skin_armature_create(const bContext *C, Scene *scene, ViewLayer *sl, Object *skin_ob) { Main *bmain = CTX_data_main(C); EvaluationContext eval_ctx; @@ -1784,7 +1784,7 @@ static int skin_armature_create_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = CTX_data_active_object(C), *arm_ob; Mesh *me = ob->data; ModifierData *skin_md; diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index eee1ae64505..132d613440c 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -127,7 +127,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *obedit = CTX_data_edit_object(C); EvaluationContext eval_ctx; BMVert *eve; @@ -342,7 +342,7 @@ static int make_proxy_exec(bContext *C, wmOperator *op) Object *ob, *gob = ED_object_active_context(C); GroupObject *go; Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); if (gob->dup_group != NULL) { go = BLI_findlink(&gob->dup_group->gobject, RNA_enum_get(op->ptr, "object")); @@ -360,7 +360,7 @@ static int make_proxy_exec(bContext *C, wmOperator *op) BLI_snprintf(name, sizeof(name), "%s_proxy", ((ID *)(gob ? gob : ob))->name + 2); /* Add new object for the proxy */ - newob = BKE_object_add_from(bmain, scene, scene_layer, OB_EMPTY, name, gob ? gob : ob); + newob = BKE_object_add_from(bmain, scene, view_layer, OB_EMPTY, name, gob ? gob : ob); /* set layers OK */ BKE_object_make_proxy(newob, ob, gob); @@ -1697,8 +1697,8 @@ static void single_object_users(Main *bmain, Scene *scene, View3D *v3d, const in SceneCollection *msc = BKE_collection_master(scene); single_object_users_scene_collection(bmain, scene, msc, flag, copy_groups); - /* loop over SceneLayers and assign the pointers accordingly */ - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { + /* loop over ViewLayers and assign the pointers accordingly */ + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { for (Base *base = sl->object_bases.first; base; base = base->next) { ID_NEW_REMAP(base->object); } @@ -1779,7 +1779,7 @@ static void new_id_matar(Main *bmain, Material **matar, const int totcol) } } -static void single_obdata_users(Main *bmain, Scene *scene, SceneLayer *sl, const int flag) +static void single_obdata_users(Main *bmain, Scene *scene, ViewLayer *sl, const int flag) { Lamp *la; Curve *cu; @@ -1866,7 +1866,7 @@ static void single_obdata_users(Main *bmain, Scene *scene, SceneLayer *sl, const } } -static void single_object_action_users(Scene *scene, SceneLayer *sl, const int flag) +static void single_object_action_users(Scene *scene, ViewLayer *sl, const int flag) { FOREACH_OBJECT_FLAG(scene, sl, flag, ob) if (!ID_IS_LINKED(ob)) { @@ -1876,7 +1876,7 @@ static void single_object_action_users(Scene *scene, SceneLayer *sl, const int f FOREACH_OBJECT_FLAG_END } -static void single_mat_users(Main *bmain, Scene *scene, SceneLayer *sl, const int flag, const bool do_textures) +static void single_mat_users(Main *bmain, Scene *scene, ViewLayer *sl, const int flag, const bool do_textures) { Material *ma, *man; Tex *tex; @@ -2132,7 +2132,7 @@ static void tag_localizable_objects(bContext *C, const int mode) * Instance indirectly referenced zero user objects, * otherwise they're lost on reload, see T40595. */ -static bool make_local_all__instance_indirect_unused(Main *bmain, Scene *scene, SceneLayer *sl, SceneCollection *sc) +static bool make_local_all__instance_indirect_unused(Main *bmain, Scene *scene, ViewLayer *sl, SceneCollection *sc) { Object *ob; bool changed = false; @@ -2144,7 +2144,7 @@ static bool make_local_all__instance_indirect_unused(Main *bmain, Scene *scene, id_us_plus(&ob->id); BKE_collection_object_add(scene, sc, ob); - base = BKE_scene_layer_base_find(sl, ob); + base = BKE_view_layer_base_find(sl, ob); base->flag |= BASE_SELECTED; BKE_scene_object_base_flag_sync_from_base(base); DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); @@ -2226,15 +2226,15 @@ static int make_local_exec(bContext *C, wmOperator *op) /* Note: we (ab)use LIB_TAG_PRE_EXISTING to cherry pick which ID to make local... */ if (mode == MAKE_LOCAL_ALL) { - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); SceneCollection *scene_collection = CTX_data_scene_collection(C); BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, false); /* De-select so the user can differentiate newly instanced from existing objects. */ - BKE_scene_layer_base_deselect_all(scene_layer); + BKE_view_layer_base_deselect_all(view_layer); - if (make_local_all__instance_indirect_unused(bmain, scene, scene_layer, scene_collection)) { + if (make_local_all__instance_indirect_unused(bmain, scene, view_layer, scene_collection)) { BKE_report(op->reports, RPT_INFO, "Orphan library objects added to the current scene to avoid loss"); } } @@ -2334,7 +2334,7 @@ static int make_single_user_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); View3D *v3d = CTX_wm_view3d(C); /* ok if this is NULL */ const int flag = (RNA_enum_get(op->ptr, "type") == MAKE_SINGLE_USER_SELECTED) ? SELECT : 0; const bool copy_groups = false; @@ -2342,7 +2342,7 @@ static int make_single_user_exec(bContext *C, wmOperator *op) if (RNA_boolean_get(op->ptr, "object")) { if (flag == SELECT) { - BKE_scene_layer_selected_objects_tag(sl, OB_DONE); + BKE_view_layer_selected_objects_tag(sl, OB_DONE); single_object_users(bmain, scene, v3d, OB_DONE, copy_groups); } else { diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 1542978041e..225f435016a 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -118,15 +118,15 @@ void ED_object_base_select(Base *base, eObjectSelect_Mode mode) */ void ED_object_base_activate(bContext *C, Base *base) { - SceneLayer *scene_layer = CTX_data_scene_layer(C); - scene_layer->basact = base; + ViewLayer *view_layer = CTX_data_view_layer(C); + view_layer->basact = base; if (base) { #ifdef USE_WORKSPACE_MODE WorkSpace *workspace = CTX_wm_workspace(C); BKE_workspace_object_mode_set(workspace, base->object->mode); #endif - WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene_layer); + WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, view_layer); } else { WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, NULL); @@ -389,7 +389,7 @@ void ED_object_select_linked_by_id(bContext *C, ID *id) static int object_select_linked_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Object *ob; int nr = RNA_enum_get(op->ptr, "type"); bool changed = false, extend; @@ -404,7 +404,7 @@ static int object_select_linked_exec(bContext *C, wmOperator *op) CTX_DATA_END; } - ob = OBACT(sl); + ob = OBACT(view_layer); if (ob == NULL) { BKE_report(op->reports, RPT_ERROR, "No active object"); return OPERATOR_CANCELLED; @@ -548,7 +548,7 @@ static bool select_grouped_children(bContext *C, Object *ob, const bool recursiv static bool select_grouped_parent(bContext *C) /* Makes parent active and de-selected OBACT */ { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Base *baspar, *basact = CTX_data_active_base(C); bool changed = false; @@ -556,7 +556,7 @@ static bool select_grouped_parent(bContext *C) /* Makes parent active and de-sel return 0; /* we know OBACT is valid */ } - baspar = BKE_scene_layer_base_find(sl, basact->object->parent); + baspar = BKE_view_layer_base_find(sl, basact->object->parent); /* can be NULL if parent in other scene */ if (baspar && BASE_SELECTABLE(baspar)) { @@ -616,7 +616,7 @@ static bool select_grouped_group(bContext *C, Object *ob) /* Select objects in static bool select_grouped_object_hooks(bContext *C, Object *ob) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); bool changed = false; Base *base; @@ -627,7 +627,7 @@ static bool select_grouped_object_hooks(bContext *C, Object *ob) if (md->type == eModifierType_Hook) { hmd = (HookModifierData *) md; if (hmd->object && !(hmd->object->flag & SELECT)) { - base = BKE_scene_layer_base_find(sl, hmd->object); + base = BKE_view_layer_base_find(sl, hmd->object); if (base && (BASE_SELECTABLE(base))) { ED_object_base_select(base, BA_SELECT); changed = true; @@ -799,7 +799,7 @@ static bool select_grouped_keyingset(bContext *C, Object *UNUSED(ob), ReportList static int object_select_grouped_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Object *ob; const int type = RNA_enum_get(op->ptr, "type"); bool changed = false, extend; @@ -815,7 +815,7 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op) CTX_DATA_END; } - ob = OBACT(sl); + ob = OBACT(view_layer); if (ob == NULL) { BKE_report(op->reports, RPT_ERROR, "No active object"); return OPERATOR_CANCELLED; @@ -1014,7 +1014,7 @@ void OBJECT_OT_select_same_group(wmOperatorType *ot) static int object_select_mirror_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); bool extend; extend = RNA_boolean_get(op->ptr, "extend"); @@ -1028,7 +1028,7 @@ static int object_select_mirror_exec(bContext *C, wmOperator *op) if (!STREQ(name_flip, primbase->object->id.name + 2)) { Object *ob = (Object *)BKE_libblock_find_name(ID_OB, name_flip); if (ob) { - Base *secbase = BKE_scene_layer_base_find(sl, ob); + Base *secbase = BKE_view_layer_base_find(sl, ob); if (secbase) { ED_object_base_select(secbase, BA_SELECT); @@ -1071,9 +1071,9 @@ void OBJECT_OT_select_mirror(wmOperatorType *ot) static bool object_select_more_less(bContext *C, const bool select) { - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { Object *ob = base->object; ob->flag &= ~OB_DONE; ob->id.tag &= ~LIB_TAG_DOIT; diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c index c10604b0edd..79162955480 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.c +++ b/source/blender/editors/physics/dynamicpaint_ops.c @@ -288,7 +288,7 @@ typedef struct DynamicPaintBakeJob { struct Main *bmain; Scene *scene; - SceneLayer *scene_layer; + ViewLayer *view_layer; Depsgraph *depsgraph; Object *ob; @@ -365,7 +365,7 @@ static void dynamicPaint_bakeImageSequence(DynamicPaintBakeJob *job) frame = surface->start_frame; orig_frame = scene->r.cfra; scene->r.cfra = (int)frame; - ED_update_for_newframe(job->bmain, scene, job->scene_layer, job->depsgraph); + ED_update_for_newframe(job->bmain, scene, job->view_layer, job->depsgraph); /* Init surface */ if (!dynamicPaint_createUVSurface(scene, surface, job->progress, job->do_update)) { @@ -391,7 +391,7 @@ static void dynamicPaint_bakeImageSequence(DynamicPaintBakeJob *job) /* calculate a frame */ scene->r.cfra = (int)frame; - ED_update_for_newframe(job->bmain, scene, job->scene_layer, job->depsgraph); + ED_update_for_newframe(job->bmain, scene, job->view_layer, job->depsgraph); if (!dynamicPaint_calculateFrame(surface, job->eval_ctx, scene, cObject, frame)) { job->success = 0; return; @@ -460,7 +460,7 @@ static int dynamicpaint_bake_exec(struct bContext *C, struct wmOperator *op) DynamicPaintCanvasSettings *canvas; Object *ob = ED_object_context(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); EvaluationContext *eval_ctx = MEM_mallocN(sizeof(*eval_ctx), "EvaluationContext"); CTX_data_eval_ctx(C, eval_ctx); @@ -491,7 +491,7 @@ static int dynamicpaint_bake_exec(struct bContext *C, struct wmOperator *op) DynamicPaintBakeJob *job = MEM_mallocN(sizeof(DynamicPaintBakeJob), "DynamicPaintBakeJob"); job->bmain = CTX_data_main(C); job->scene = scene; - job->scene_layer = sl; + job->view_layer = sl; job->depsgraph = CTX_data_depsgraph(C); job->ob = ob; job->canvas = canvas; diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 8986ebd26e9..0ed360405d8 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -87,7 +87,7 @@ #include "physics_intern.h" void PE_create_particle_edit( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, Object *ob, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, Object *ob, PointCache *cache, ParticleSystem *psys); void PTCacheUndo_clear(PTCacheEdit *edit); void recalc_lengths(PTCacheEdit *edit); @@ -114,7 +114,7 @@ void update_world_cos(Object *ob, PTCacheEdit *edit); int PE_poll(bContext *C) { Scene *scene= CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob= CTX_data_active_object(C); if (!scene || !sl || !ob || !(ob->mode & OB_MODE_PARTICLE_EDIT)) @@ -126,7 +126,7 @@ int PE_poll(bContext *C) int PE_hair_poll(bContext *C) { Scene *scene= CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob= CTX_data_active_object(C); PTCacheEdit *edit; @@ -219,7 +219,7 @@ static float pe_brush_size_get(const Scene *UNUSED(scene), ParticleBrushData *br * note: this function runs on poll, therefor it can runs many times a second * keep it fast! */ static PTCacheEdit *pe_get_current( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, Object *ob, int create) + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, Object *ob, int create) { ParticleEditSettings *pset= PE_settings(scene); PTCacheEdit *edit = NULL; @@ -230,7 +230,7 @@ static PTCacheEdit *pe_get_current( return NULL; pset->scene = scene; - pset->scene_layer = sl; + pset->view_layer = sl; pset->object = ob; BKE_ptcache_ids_from_object(&pidlist, ob, NULL, 0); @@ -305,7 +305,7 @@ static PTCacheEdit *pe_get_current( return edit; } -PTCacheEdit *PE_get_current(Scene *scene, SceneLayer *sl, Object *ob) +PTCacheEdit *PE_get_current(Scene *scene, ViewLayer *sl, Object *ob) { return pe_get_current(NULL, scene, sl, ob, 0); } @@ -364,7 +364,7 @@ typedef struct PEData { const bContext *context; Scene *scene; - SceneLayer *scene_layer; + ViewLayer *view_layer; Object *ob; DerivedMesh *dm; PTCacheEdit *edit; @@ -399,9 +399,9 @@ static void PE_set_data(bContext *C, PEData *data) memset(data, 0, sizeof(*data)); data->scene = CTX_data_scene(C); - data->scene_layer = CTX_data_scene_layer(C); + data->view_layer = CTX_data_view_layer(C); data->ob = CTX_data_active_object(C); - data->edit = PE_get_current(data->scene, data->scene_layer, data->ob); + data->edit = PE_get_current(data->scene, data->view_layer, data->ob); } static void PE_set_view3d_data(bContext *C, PEData *data) @@ -1163,7 +1163,7 @@ void recalc_emitter_field(Object *ob, ParticleSystem *psys) BLI_kdtree_balance(edit->emitter_field); } -static void PE_update_selection(const bContext *C, Scene *scene, SceneLayer *sl, Object *ob, int useflag) +static void PE_update_selection(const bContext *C, Scene *scene, ViewLayer *sl, Object *ob, int useflag) { PTCacheEdit *edit = PE_get_current(scene, sl, ob); HairKey *hkey; @@ -1273,7 +1273,7 @@ static void update_velocities(PTCacheEdit *edit) } } -void PE_update_object(const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, Object *ob, int useflag) +void PE_update_object(const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, Object *ob, int useflag) { /* use this to do partial particle updates, not usable when adding or * removing, then a full redo is necessary and calling this may crash */ @@ -1413,7 +1413,7 @@ static void select_action_apply(PTCacheEditPoint *point, PTCacheEditKey *key, in static int pe_select_all_exec(bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob= CTX_data_active_object(C); PTCacheEdit *edit= PE_get_current(scene, sl, ob); POINT_P; KEY_K; @@ -1467,7 +1467,7 @@ int PE_mouse_particles(bContext *C, const int mval[2], bool extend, bool deselec { PEData data; Scene *scene= CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob= CTX_data_active_object(C); PTCacheEdit *edit= PE_get_current(scene, sl, ob); POINT_P; KEY_K; @@ -1537,7 +1537,7 @@ static int select_roots_exec(bContext *C, wmOperator *op) data.select_action = action; foreach_point(&data, select_root); - PE_update_selection(C, data.scene, data.scene_layer, data.ob, 1); + PE_update_selection(C, data.scene, data.view_layer, data.ob, 1); WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob); return OPERATOR_FINISHED; @@ -1602,7 +1602,7 @@ static int select_tips_exec(bContext *C, wmOperator *op) data.select_action = action; foreach_point(&data, select_tip); - PE_update_selection(C, data.scene, data.scene_layer, data.ob, 1); + PE_update_selection(C, data.scene, data.view_layer, data.ob, 1); WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob); return OPERATOR_FINISHED; @@ -1641,7 +1641,7 @@ static int select_random_exec(bContext *C, wmOperator *op) PEData data; int type; Scene *scene; - SceneLayer *sl; + ViewLayer *sl; Object *ob; /* used by LOOP_VISIBLE_POINTS, LOOP_VISIBLE_KEYS and LOOP_KEYS */ @@ -1661,7 +1661,7 @@ static int select_random_exec(bContext *C, wmOperator *op) PE_set_data(C, &data); data.select_action = SEL_SELECT; scene = CTX_data_scene(C); - sl = CTX_data_scene_layer(C); + sl = CTX_data_view_layer(C); ob = CTX_data_active_object(C); edit = PE_get_current(scene, sl, ob); @@ -1688,7 +1688,7 @@ static int select_random_exec(bContext *C, wmOperator *op) BLI_rng_free(rng); - PE_update_selection(C, data.scene, data.scene_layer, data.ob, 1); + PE_update_selection(C, data.scene, data.view_layer, data.ob, 1); WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob); return OPERATOR_FINISHED; @@ -1732,7 +1732,7 @@ static int select_linked_exec(bContext *C, wmOperator *op) data.select= !RNA_boolean_get(op->ptr, "deselect"); for_mouse_hit_keys(&data, select_keys, 1); /* nearest only */ - PE_update_selection(C, data.scene, data.scene_layer, data.ob, 1); + PE_update_selection(C, data.scene, data.view_layer, data.ob, 1); WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob); return OPERATOR_FINISHED; @@ -1780,7 +1780,7 @@ void PE_deselect_all_visible(PTCacheEdit *edit) int PE_border_select(bContext *C, rcti *rect, bool select, bool extend) { Scene *scene= CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob= CTX_data_active_object(C); PTCacheEdit *edit= PE_get_current(scene, sl, ob); PEData data; @@ -1808,7 +1808,7 @@ int PE_border_select(bContext *C, rcti *rect, bool select, bool extend) int PE_circle_select(bContext *C, int selecting, const int mval[2], float rad) { Scene *scene= CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob= CTX_data_active_object(C); PTCacheEdit *edit= PE_get_current(scene, sl, ob); PEData data; @@ -1834,7 +1834,7 @@ int PE_circle_select(bContext *C, int selecting, const int mval[2], float rad) int PE_lasso_select(bContext *C, const int mcords[][2], const short moves, bool extend, bool select) { Scene *scene= CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob= CTX_data_active_object(C); ARegion *ar= CTX_wm_region(C); ParticleEditSettings *pset= PE_settings(scene); @@ -1924,7 +1924,7 @@ static int hide_exec(bContext *C, wmOperator *op) { Object *ob= CTX_data_active_object(C); Scene *scene= CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); PTCacheEdit *edit= PE_get_current(scene, sl, ob); POINT_P; KEY_K; @@ -1977,7 +1977,7 @@ static int reveal_exec(bContext *C, wmOperator *op) { Object *ob= CTX_data_active_object(C); Scene *scene= CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); PTCacheEdit *edit= PE_get_current(scene, sl, ob); const bool select = RNA_boolean_get(op->ptr, "select"); POINT_P; KEY_K; @@ -2055,7 +2055,7 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op)) PE_set_data(C, &data); foreach_point(&data, select_less_keys); - PE_update_selection(C, data.scene, data.scene_layer, data.ob, 1); + PE_update_selection(C, data.scene, data.view_layer, data.ob, 1); WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob); return OPERATOR_FINISHED; @@ -2117,7 +2117,7 @@ static int select_more_exec(bContext *C, wmOperator *UNUSED(op)) PE_set_data(C, &data); foreach_point(&data, select_more_keys); - PE_update_selection(C, data.scene, data.scene_layer, data.ob, 1); + PE_update_selection(C, data.scene, data.view_layer, data.ob, 1); WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_SELECTED, data.ob); return OPERATOR_FINISHED; @@ -2220,7 +2220,7 @@ static int rekey_exec(bContext *C, wmOperator *op) foreach_selected_point(&data, rekey_particle); recalc_lengths(data.edit); - PE_update_object(&eval_ctx, data.scene, data.scene_layer, data.ob, 1); + PE_update_object(&eval_ctx, data.scene, data.view_layer, data.ob, 1); WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, data.ob); return OPERATOR_FINISHED; @@ -2245,7 +2245,7 @@ void PARTICLE_OT_rekey(wmOperatorType *ot) RNA_def_int(ot->srna, "keys_number", 2, 2, INT_MAX, "Number of Keys", "", 2, 100); } -static void rekey_particle_to_time(const bContext *C, Scene *scene, SceneLayer *sl, Object *ob, int pa_index, float path_time) +static void rekey_particle_to_time(const bContext *C, Scene *scene, ViewLayer *sl, Object *ob, int pa_index, float path_time) { PTCacheEdit *edit= PE_get_current(scene, sl, ob); ParticleSystem *psys; @@ -2561,7 +2561,7 @@ static int subdivide_exec(bContext *C, wmOperator *UNUSED(op)) foreach_point(&data, subdivide_particle); recalc_lengths(data.edit); - PE_update_object(&eval_ctx, data.scene, data.scene_layer, data.ob, 1); + PE_update_object(&eval_ctx, data.scene, data.view_layer, data.ob, 1); WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, data.ob); return OPERATOR_FINISHED; @@ -2587,7 +2587,7 @@ void PARTICLE_OT_subdivide(wmOperatorType *ot) static int remove_doubles_exec(bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob= CTX_data_active_object(C); PTCacheEdit *edit= PE_get_current(scene, sl, ob); ParticleSystem *psys = edit->psys; @@ -2680,7 +2680,7 @@ void PARTICLE_OT_remove_doubles(wmOperatorType *ot) static int weight_set_exec(bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); ParticleEditSettings *pset= PE_settings(scene); Object *ob= CTX_data_active_object(C); PTCacheEdit *edit= PE_get_current(scene, sl, ob); @@ -2840,7 +2840,7 @@ void PARTICLE_OT_delete(wmOperatorType *ot) /*************************** mirror operator **************************/ -static void PE_mirror_x(Scene *scene, SceneLayer *sl, Object *ob, int tagged) +static void PE_mirror_x(Scene *scene, ViewLayer *sl, Object *ob, int tagged) { Mesh *me= (Mesh *)(ob->data); ParticleSystemModifierData *psmd; @@ -2991,7 +2991,7 @@ static void PE_mirror_x(Scene *scene, SceneLayer *sl, Object *ob, int tagged) static int mirror_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene= CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob= CTX_data_active_object(C); PTCacheEdit *edit= PE_get_current(scene, sl, ob); @@ -3132,7 +3132,7 @@ static void brush_cut(PEData *data, int pa_index) edit->points[pa_index].flag |= PEP_TAG; } else { - rekey_particle_to_time(data->context, data->scene, data->scene_layer, ob, pa_index, cut_time); + rekey_particle_to_time(data->context, data->scene, data->view_layer, ob, pa_index, cut_time); edit->points[pa_index].flag |= PEP_EDIT_RECALC; } } @@ -3768,7 +3768,7 @@ static int brush_add(const bContext *C, PEData *data, short number) typedef struct BrushEdit { Scene *scene; - SceneLayer *sl; + ViewLayer *sl; Object *ob; PTCacheEdit *edit; @@ -3783,7 +3783,7 @@ typedef struct BrushEdit { static int brush_edit_init(bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob= CTX_data_active_object(C); ParticleEditSettings *pset= PE_settings(scene); PTCacheEdit *edit= PE_get_current(scene, sl, ob); @@ -3820,7 +3820,7 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr) { BrushEdit *bedit= op->customdata; Scene *scene= bedit->scene; - SceneLayer *sl = bedit->sl; + ViewLayer *sl = bedit->sl; Object *ob= bedit->ob; PTCacheEdit *edit= bedit->edit; ParticleEditSettings *pset= PE_settings(scene); @@ -4237,7 +4237,7 @@ static void shape_cut(PEData *data, int pa_index) edit->points[pa_index].flag |= PEP_TAG; } else { - rekey_particle_to_time(data->context, data->scene, data->scene_layer, ob, pa_index, cut_time); + rekey_particle_to_time(data->context, data->scene, data->view_layer, ob, pa_index, cut_time); edit->points[pa_index].flag |= PEP_EDIT_RECALC; } } @@ -4246,7 +4246,7 @@ static void shape_cut(PEData *data, int pa_index) static int shape_cut_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = CTX_data_active_object(C); ParticleEditSettings *pset = PE_settings(scene); PTCacheEdit *edit = PE_get_current(scene, sl, ob); @@ -4461,7 +4461,7 @@ static void get_PTCacheUndo(PTCacheEdit *edit, PTCacheUndo *undo) } } -void PE_undo_push(Scene *scene, SceneLayer *sl, const char *str) +void PE_undo_push(Scene *scene, ViewLayer *sl, const char *str) { PTCacheEdit *edit= PE_get_current(scene, sl, OBACT(sl)); PTCacheUndo *undo; @@ -4503,7 +4503,7 @@ void PE_undo_push(Scene *scene, SceneLayer *sl, const char *str) make_PTCacheUndo(edit, edit->curundo); } -void PE_undo_step(Scene *scene, SceneLayer *sl, int step) +void PE_undo_step(Scene *scene, ViewLayer *sl, int step) { PTCacheEdit *edit= PE_get_current(scene, sl, OBACT(sl)); @@ -4539,7 +4539,7 @@ void PE_undo_step(Scene *scene, SceneLayer *sl, int step) DEG_id_tag_update(&OBACT(sl)->id, OB_RECALC_DATA); } -bool PE_undo_is_valid(Scene *scene, SceneLayer *sl) +bool PE_undo_is_valid(Scene *scene, ViewLayer *sl) { PTCacheEdit *edit= PE_get_current(scene, sl, OBACT(sl)); @@ -4564,17 +4564,17 @@ void PTCacheUndo_clear(PTCacheEdit *edit) edit->curundo= NULL; } -void PE_undo(Scene *scene, SceneLayer *sl) +void PE_undo(Scene *scene, ViewLayer *sl) { PE_undo_step(scene, sl, 1); } -void PE_redo(Scene *scene, SceneLayer *sl) +void PE_redo(Scene *scene, ViewLayer *sl) { PE_undo_step(scene, sl, -1); } -void PE_undo_number(Scene *scene, SceneLayer *sl, int nr) +void PE_undo_number(Scene *scene, ViewLayer *sl, int nr) { PTCacheEdit *edit= PE_get_current(scene, sl, OBACT(sl)); PTCacheUndo *undo; @@ -4590,7 +4590,7 @@ void PE_undo_number(Scene *scene, SceneLayer *sl, int nr) /* get name of undo item, return null if no item with this index */ /* if active pointer, set it to 1 if true */ -const char *PE_undo_get_name(Scene *scene, SceneLayer *sl, int nr, bool *r_active) +const char *PE_undo_get_name(Scene *scene, ViewLayer *sl, int nr, bool *r_active) { PTCacheEdit *edit= PE_get_current(scene, sl, OBACT(sl)); PTCacheUndo *undo; @@ -4611,7 +4611,7 @@ const char *PE_undo_get_name(Scene *scene, SceneLayer *sl, int nr, bool *r_activ /************************ utilities ******************************/ -int PE_minmax(Scene *scene, SceneLayer *sl, float min[3], float max[3]) +int PE_minmax(Scene *scene, ViewLayer *sl, float min[3], float max[3]) { Object *ob= OBACT(sl); PTCacheEdit *edit= PE_get_current(scene, sl, ob); @@ -4652,7 +4652,7 @@ int PE_minmax(Scene *scene, SceneLayer *sl, float min[3], float max[3]) /* initialize needed data for bake edit */ void PE_create_particle_edit( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, Object *ob, PointCache *cache, ParticleSystem *psys) + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, Object *ob, PointCache *cache, ParticleSystem *psys) { PTCacheEdit *edit; ParticleSystemModifierData *psmd = (psys) ? psys_get_modifier(ob, psys) : NULL; @@ -4966,7 +4966,7 @@ static int unify_length_exec(bContext *C, wmOperator *UNUSED(op)) { Object *ob = CTX_data_active_object(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); PTCacheEdit *edit = PE_get_current(scene, sl, ob); float average_length = calculate_average_length(edit); diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index c4ed32e8743..8979630e834 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -71,7 +71,7 @@ #include "physics_intern.h" -extern void PE_create_particle_edit(const bContext *C, Scene *scene, SceneLayer *sl, Object *ob, PointCache *cache, ParticleSystem *psys); +extern void PE_create_particle_edit(const bContext *C, Scene *scene, ViewLayer *sl, Object *ob, PointCache *cache, ParticleSystem *psys); extern void PTCacheUndo_clear(PTCacheEdit *edit); extern void recalc_lengths(PTCacheEdit *edit); extern void recalc_emitter_field(Object *ob, ParticleSystem *psys); @@ -135,7 +135,7 @@ static int particle_system_remove_exec(bContext *C, wmOperator *UNUSED(op)) { Object *ob = ED_object_context(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); int mode_orig; if (!scene || !ob) @@ -569,7 +569,7 @@ void PARTICLE_OT_dupliob_move_down(wmOperatorType *ot) /************************ connect/disconnect hair operators *********************/ static void disconnect_hair( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, Object *ob, ParticleSystem *psys) { ParticleSystemModifierData *psmd = psys_get_modifier(ob, psys); @@ -622,7 +622,7 @@ static void disconnect_hair( static int disconnect_hair_exec(bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob= ED_object_context(C); ParticleSystem *psys= NULL; const bool all = RNA_boolean_get(op->ptr, "all"); @@ -667,7 +667,7 @@ void PARTICLE_OT_disconnect_hair(wmOperatorType *ot) * from/to_mat : additional transform for from/to particles (e.g. for using object space copying) */ static bool remap_hair_emitter( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, Object *ob, ParticleSystem *psys, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, Object *ob, ParticleSystem *psys, Object *target_ob, ParticleSystem *target_psys, PTCacheEdit *target_edit, float from_mat[4][4], float to_mat[4][4], bool from_global, bool to_global) { @@ -859,7 +859,7 @@ static bool remap_hair_emitter( } static bool connect_hair( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, Object *ob, ParticleSystem *psys) { bool ok; @@ -879,7 +879,7 @@ static int connect_hair_exec(bContext *C, wmOperator *op) { EvaluationContext eval_ctx; Scene *scene= CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob= ED_object_context(C); ParticleSystem *psys= NULL; const bool all = RNA_boolean_get(op->ptr, "all"); @@ -934,7 +934,7 @@ typedef enum eCopyParticlesSpace { } eCopyParticlesSpace; static void copy_particle_edit( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, Object *ob, ParticleSystem *psys, ParticleSystem *psys_from) { PTCacheEdit *edit_from = psys_from->edit, *edit; @@ -1018,7 +1018,7 @@ static void remove_particle_systems_from_object(Object *ob_to) /* single_psys_from is optional, if NULL all psys of ob_from are copied */ static bool copy_particle_systems_to_object(const bContext *C, Scene *scene, - SceneLayer *sl, + ViewLayer *sl, Object *ob_from, ParticleSystem *single_psys_from, Object *ob_to, @@ -1174,7 +1174,7 @@ static int copy_particle_systems_exec(bContext *C, wmOperator *op) const bool remove_target_particles = RNA_boolean_get(op->ptr, "remove_target_particles"); const bool use_active = RNA_boolean_get(op->ptr, "use_active"); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob_from = ED_object_active_context(C); ParticleSystem *psys_from = use_active ? CTX_data_pointer_get_type(C, "particle_system", &RNA_ParticleSystem).data : NULL; @@ -1250,7 +1250,7 @@ static int duplicate_particle_systems_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); Object *ob = ED_object_active_context(C); ParticleSystem *psys = CTX_data_pointer_get_type(C, "particle_system", &RNA_ParticleSystem).data; - copy_particle_systems_to_object(C, scene, CTX_data_scene_layer(C), ob, psys, ob, + copy_particle_systems_to_object(C, scene, CTX_data_view_layer(C), ob, psys, ob, PAR_COPY_SPACE_OBJECT, duplicate_settings); return OPERATOR_FINISHED; } diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 3c4aeaf145f..bfacd709c73 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -331,7 +331,7 @@ static void free_all_fluidobject_channels(ListBase *fobjects) static void fluid_init_all_channels(bContext *C, Object *UNUSED(fsDomain), FluidsimSettings *domainSettings, FluidAnimChannels *channels, ListBase *fobjects) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Depsgraph *depsgraph = CTX_data_depsgraph(C); EvaluationContext eval_ctx; Base *base; @@ -580,7 +580,7 @@ static void export_fluid_objects(const bContext *C, ListBase *fobjects, Scene *s } } -static int fluid_validate_scene(ReportList *reports, SceneLayer *sl, Object *fsDomain) +static int fluid_validate_scene(ReportList *reports, ViewLayer *sl, Object *fsDomain) { Base *base; Object *newdomain = NULL; @@ -846,7 +846,7 @@ static void fluidsim_delete_until_lastframe(FluidsimSettings *fss, const char *r static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, short do_job) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Depsgraph *depsgraph = CTX_data_depsgraph(C); int i; FluidsimSettings *domainSettings; diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c index 7dab98036c6..a859f664dc8 100644 --- a/source/blender/editors/physics/physics_pointcache.c +++ b/source/blender/editors/physics/physics_pointcache.c @@ -166,7 +166,7 @@ static PTCacheBaker *ptcache_baker_create(bContext *C, wmOperator *op, bool all) baker->main = CTX_data_main(C); baker->scene = CTX_data_scene(C); - baker->scene_layer = CTX_data_scene_layer(C); + baker->view_layer = CTX_data_view_layer(C); baker->depsgraph = CTX_data_depsgraph(C); baker->bake = RNA_boolean_get(op->ptr, "bake"); baker->render = 0; diff --git a/source/blender/editors/physics/rigidbody_constraint.c b/source/blender/editors/physics/rigidbody_constraint.c index 13b2943b6e6..c454f2dedca 100644 --- a/source/blender/editors/physics/rigidbody_constraint.c +++ b/source/blender/editors/physics/rigidbody_constraint.c @@ -119,7 +119,7 @@ static int rigidbody_con_add_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); RigidBodyWorld *rbw = BKE_rigidbody_get_world(scene); Object *ob = OBACT(sl); int type = RNA_enum_get(op->ptr, "type"); @@ -169,7 +169,7 @@ static int rigidbody_con_remove_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = OBACT(sl); /* apply to active object */ diff --git a/source/blender/editors/render/render_intern.h b/source/blender/editors/render/render_intern.h index fb07b03c286..2bc96a7f218 100644 --- a/source/blender/editors/render/render_intern.h +++ b/source/blender/editors/render/render_intern.h @@ -53,8 +53,8 @@ void WORLD_OT_new(struct wmOperatorType *ot); void MATERIAL_OT_copy(struct wmOperatorType *ot); void MATERIAL_OT_paste(struct wmOperatorType *ot); -void SCENE_OT_render_layer_add(struct wmOperatorType *ot); -void SCENE_OT_render_layer_remove(struct wmOperatorType *ot); +void SCENE_OT_view_layer_add(struct wmOperatorType *ot); +void SCENE_OT_view_layer_remove(struct wmOperatorType *ot); void SCENE_OT_render_view_add(struct wmOperatorType *ot); void SCENE_OT_render_view_remove(struct wmOperatorType *ot); diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 8119e88eeaa..2c659d2b985 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -101,7 +101,7 @@ static int render_break(void *rjv); typedef struct RenderJob { Main *main; Scene *scene; - SceneLayer *scene_layer; + ViewLayer *view_layer; Scene *current_scene; /* TODO(sergey): Should not be needed once engine will have own * depsgraph and copy-on-write will be implemented. @@ -260,7 +260,7 @@ static void image_buffer_rect_update(RenderJob *rj, RenderResult *rr, ImBuf *ibu /* set callbacks, exported to sequence render too. * Only call in foreground (UI) renders. */ -static void screen_render_scene_layer_set(wmOperator *op, Main *mainp, Scene **scene, SceneLayer **scene_layer) +static void screen_render_view_layer_set(wmOperator *op, Main *mainp, Scene **scene, ViewLayer **view_layer) { /* single layer re-render */ if (RNA_struct_property_is_set(op->ptr, "scene")) { @@ -280,14 +280,14 @@ static void screen_render_scene_layer_set(wmOperator *op, Main *mainp, Scene **s } if (RNA_struct_property_is_set(op->ptr, "layer")) { - SceneLayer *rl; + ViewLayer *rl; char rl_name[RE_MAXNAME]; RNA_string_get(op->ptr, "layer", rl_name); - rl = (SceneLayer *)BLI_findstring(&(*scene)->render_layers, rl_name, offsetof(SceneLayer, name)); + rl = (ViewLayer *)BLI_findstring(&(*scene)->view_layers, rl_name, offsetof(ViewLayer, name)); if (rl) - *scene_layer = rl; + *view_layer = rl; } } @@ -295,7 +295,7 @@ static void screen_render_scene_layer_set(wmOperator *op, Main *mainp, Scene **s static int screen_render_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = NULL; + ViewLayer *view_layer = NULL; Depsgraph *depsgraph = CTX_data_depsgraph(C); Render *re; Image *ima; @@ -307,7 +307,7 @@ static int screen_render_exec(bContext *C, wmOperator *op) struct Object *camera_override = v3d ? V3D_CAMERA_LOCAL(v3d) : NULL; /* custom scene and single layer re-render */ - screen_render_scene_layer_set(op, mainp, &scene, &scene_layer); + screen_render_view_layer_set(op, mainp, &scene, &view_layer); if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) { BKE_report(op->reports, RPT_ERROR, "Cannot write a single file with an animation format selected"); @@ -337,13 +337,13 @@ static int screen_render_exec(bContext *C, wmOperator *op) if (is_animation) RE_BlenderAnim(re, mainp, scene, camera_override, lay_override, scene->r.sfra, scene->r.efra, scene->r.frame_step); else - RE_BlenderFrame(re, mainp, scene, scene_layer, camera_override, lay_override, scene->r.cfra, is_write_still); + RE_BlenderFrame(re, mainp, scene, view_layer, camera_override, lay_override, scene->r.cfra, is_write_still); BLI_end_threaded_malloc(); RE_SetReports(re, NULL); // no redraw needed, we leave state as we entered it - ED_update_for_newframe(mainp, scene, scene_layer, depsgraph); + ED_update_for_newframe(mainp, scene, view_layer, depsgraph); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, scene); @@ -614,7 +614,7 @@ static void render_startjob(void *rjv, short *stop, short *do_update, float *pro if (rj->anim) RE_BlenderAnim(rj->re, rj->main, rj->scene, rj->camera_override, rj->lay_override, rj->scene->r.sfra, rj->scene->r.efra, rj->scene->r.frame_step); else - RE_BlenderFrame(rj->re, rj->main, rj->scene, rj->scene_layer, rj->camera_override, rj->lay_override, rj->scene->r.cfra, rj->write_still); + RE_BlenderFrame(rj->re, rj->main, rj->scene, rj->view_layer, rj->camera_override, rj->lay_override, rj->scene->r.cfra, rj->write_still); RE_SetReports(rj->re, NULL); } @@ -657,7 +657,7 @@ static void render_endjob(void *rjv) if (rj->anim && !(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) { /* possible this fails of loading new file while rendering */ if (G.main->wm.first) { - ED_update_for_newframe(G.main, rj->scene, rj->scene_layer, rj->depsgraph); + ED_update_for_newframe(G.main, rj->scene, rj->view_layer, rj->depsgraph); } } @@ -667,7 +667,7 @@ static void render_endjob(void *rjv) /* potentially set by caller */ rj->scene->r.scemode &= ~R_NO_FRAME_UPDATE; - if (rj->scene_layer) { + if (rj->view_layer) { nodeUpdateID(rj->scene->nodetree, &rj->scene->id); WM_main_add_notifier(NC_NODE | NA_EDITED, rj->scene); } @@ -697,7 +697,7 @@ static void render_endjob(void *rjv) * engine API, so lets use simple and robust way for now * - sergey - */ - if (rj->scene->render_layers.first != rj->scene->render_layers.last || + if (rj->scene->view_layers.first != rj->scene->view_layers.last || rj->image_outdated) { void *lock; @@ -824,9 +824,9 @@ static void clean_viewport_memory(Main *bmain, Scene *scene) for (wmWindowManager *wm = bmain->wm.first; wm; wm = wm->id.next) { for (wmWindow *win = wm->windows.first; win; win = win->next) { WorkSpace *workspace = BKE_workspace_active_get(win->workspace_hook); - SceneLayer *scene_layer = BKE_scene_layer_from_workspace_get(scene, workspace); + ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace); - for (base = scene_layer->object_bases.first; base; base = base->next) { + for (base = view_layer->object_bases.first; base; base = base->next) { clean_viewport_memory_base(base); } } @@ -842,7 +842,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even { /* new render clears all callbacks */ Main *mainp; - SceneLayer *scene_layer = NULL; + ViewLayer *view_layer = NULL; Scene *scene = CTX_data_scene(C); Render *re; wmJob *wm_job; @@ -910,7 +910,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even jobflag = WM_JOB_EXCL_RENDER | WM_JOB_PRIORITY | WM_JOB_PROGRESS; /* custom scene and single layer re-render */ - screen_render_scene_layer_set(op, mainp, &scene, &scene_layer); + screen_render_view_layer_set(op, mainp, &scene, &view_layer); if (RNA_struct_property_is_set(op->ptr, "layer")) jobflag |= WM_JOB_SUSPEND; @@ -920,7 +920,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even rj->main = mainp; rj->scene = scene; rj->current_scene = rj->scene; - rj->scene_layer = scene_layer; + rj->view_layer = view_layer; /* TODO(sergey): Render engine should be using own depsgraph. */ rj->depsgraph = CTX_data_depsgraph(C); rj->camera_override = camera_override; @@ -1280,10 +1280,10 @@ static void render_view3d_startjob(void *customdata, short *stop, short *do_upda /* initalize always */ if (use_border) { rdata.mode |= R_BORDER; - RE_InitState(re, NULL, &rdata, &rp->scene->render_layers, rp->scene->active_layer, &rp->scene->view_render, NULL, rp->ar->winx, rp->ar->winy, &cliprct); + RE_InitState(re, NULL, &rdata, &rp->scene->view_layers, rp->scene->active_view_layer, &rp->scene->view_render, NULL, rp->ar->winx, rp->ar->winy, &cliprct); } else - RE_InitState(re, NULL, &rdata, &rp->scene->render_layers, rp->scene->active_layer, &rp->scene->view_render, NULL, rp->ar->winx, rp->ar->winy, NULL); + RE_InitState(re, NULL, &rdata, &rp->scene->view_layers, rp->scene->active_view_layer, &rp->scene->view_render, NULL, rp->ar->winx, rp->ar->winy, NULL); } if (orth) diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index e0193a0caea..a445f8dafea 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -95,7 +95,7 @@ typedef struct OGLRender { Render *re; Scene *scene; WorkSpace *workspace; - SceneLayer *scene_layer; + ViewLayer *view_layer; Depsgraph *depsgraph; View3D *v3d; @@ -269,7 +269,7 @@ static void screen_opengl_views_setup(OGLRender *oglrender) static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, RenderResult *rr) { Scene *scene = oglrender->scene; - SceneLayer *scene_layer = oglrender->scene_layer; + ViewLayer *view_layer = oglrender->view_layer; ARegion *ar = oglrender->ar; View3D *v3d = oglrender->v3d; RegionView3D *rv3d = oglrender->rv3d; @@ -354,7 +354,7 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R if (view_context) { ibuf_view = ED_view3d_draw_offscreen_imbuf( - &eval_ctx, scene, scene_layer, v3d, ar, sizex, sizey, + &eval_ctx, scene, view_layer, v3d, ar, sizex, sizey, IB_rect, draw_bgpic, alpha_mode, oglrender->ofs_samples, oglrender->ofs_full_samples, viewname, oglrender->fx, oglrender->ofs, err_out); @@ -366,7 +366,7 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R } else { ibuf_view = ED_view3d_draw_offscreen_imbuf_simple( - &eval_ctx, scene, scene_layer, scene->camera, oglrender->sizex, oglrender->sizey, + &eval_ctx, scene, view_layer, scene->camera, oglrender->sizex, oglrender->sizey, IB_rect, OB_SOLID, false, true, true, alpha_mode, oglrender->ofs_samples, oglrender->ofs_full_samples, viewname, oglrender->fx, oglrender->ofs, err_out); @@ -666,7 +666,7 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op) oglrender->bmain = CTX_data_main(C); oglrender->scene = scene; oglrender->workspace = workspace; - oglrender->scene_layer = CTX_data_scene_layer(C); + oglrender->view_layer = CTX_data_view_layer(C); oglrender->depsgraph = CTX_data_depsgraph(C); oglrender->cfrao = scene->r.cfra; @@ -715,7 +715,7 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op) oglrender->iuser.ok = 1; /* create render result */ - RE_InitState(oglrender->re, NULL, &scene->r, &scene->render_layers, scene->active_layer, view_render, NULL, sizex, sizey, NULL); + RE_InitState(oglrender->re, NULL, &scene->r, &scene->view_layers, scene->active_view_layer, view_render, NULL, sizex, sizey, NULL); /* create render views */ screen_opengl_views_setup(oglrender); @@ -813,9 +813,9 @@ static void screen_opengl_render_end(bContext *C, OGLRender *oglrender) if (oglrender->timer) { /* exec will not have a timer */ Depsgraph *depsgraph = oglrender->depsgraph; - SceneLayer *scene_layer = oglrender->scene_layer; + ViewLayer *view_layer = oglrender->view_layer; scene->r.cfra = oglrender->cfrao; - BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, view_layer); WM_event_remove_timer(oglrender->wm, oglrender->win, oglrender->timer); } @@ -1015,7 +1015,7 @@ static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op) Main *bmain = CTX_data_main(C); OGLRender *oglrender = op->customdata; Scene *scene = oglrender->scene; - SceneLayer *scene_layer = oglrender->scene_layer; + ViewLayer *view_layer = oglrender->view_layer; Depsgraph *depsgraph = oglrender->depsgraph; char name[FILE_MAX]; bool ok = false; @@ -1027,7 +1027,7 @@ static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op) if (CFRA < oglrender->nfra) CFRA++; while (CFRA < oglrender->nfra) { - BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, view_layer); CFRA++; } @@ -1049,7 +1049,7 @@ static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op) WM_cursor_time(oglrender->win, scene->r.cfra); - BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, view_layer); if (view_context) { if (oglrender->rv3d->persp == RV3D_CAMOB && oglrender->v3d->camera && oglrender->v3d->scenelock) { diff --git a/source/blender/editors/render/render_ops.c b/source/blender/editors/render/render_ops.c index c09e8576dc2..bd75c6879e1 100644 --- a/source/blender/editors/render/render_ops.c +++ b/source/blender/editors/render/render_ops.c @@ -56,8 +56,8 @@ void ED_operatortypes_render(void) WM_operatortype_append(MATERIAL_OT_copy); WM_operatortype_append(MATERIAL_OT_paste); - WM_operatortype_append(SCENE_OT_render_layer_add); - WM_operatortype_append(SCENE_OT_render_layer_remove); + WM_operatortype_append(SCENE_OT_view_layer_add); + WM_operatortype_append(SCENE_OT_view_layer_remove); WM_operatortype_append(SCENE_OT_render_view_add); WM_operatortype_append(SCENE_OT_render_view_remove); diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 47eca1ccba3..47794e0e357 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -306,18 +306,18 @@ static const char *preview_layer_name(const char pr_type) } } -static void set_preview_layer(SceneLayer *scene_layer, char pr_type) +static void set_preview_layer(ViewLayer *view_layer, char pr_type) { LayerCollection *lc; const char *collection_name = preview_layer_name(pr_type); - for (lc = scene_layer->layer_collections.first; lc; lc = lc->next) { + for (lc = view_layer->layer_collections.first; lc; lc = lc->next) { if (STREQ(lc->scene_collection->name, collection_name)) { lc->flag = COLLECTION_VISIBLE | COLLECTION_DISABLED; - BKE_collection_enable(scene_layer, lc); + BKE_collection_enable(view_layer, lc); } else { - BKE_collection_disable(scene_layer, lc); + BKE_collection_disable(view_layer, lc); } } } @@ -346,7 +346,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty sce = preview_get_scene(pr_main); if (sce) { - SceneLayer *scene_layer = BKE_scene_layer_from_scene_get(sce); + ViewLayer *view_layer = BKE_view_layer_from_scene_get(sce); /* this flag tells render to not execute depsgraph or ipos etc */ sce->r.scemode |= R_BUTS_PREVIEW; @@ -422,7 +422,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty /* this only works in a specific case where the preview.blend contains * an object starting with 'c' which has a material linked to it (not the obdata) * and that material has a fake shadow texture in the active texture slot */ - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { Object *ob = base->object; if (ob->id.name[2] == 'c') { Material *shadmat = give_current_material(ob, ob->actcol); @@ -439,7 +439,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty /* turn off bounce lights for volume, * doesn't make much visual difference and slows it down too */ - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { Object *ob = base->object; if (ob->type == OB_LAMP) { /* if doesn't match 'Lamp.002' --> main key light */ @@ -463,10 +463,10 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty if (sp->pr_method == PR_ICON_RENDER) { if (mat->material_type == MA_TYPE_HALO) { - set_preview_layer(scene_layer, MA_FLAT); + set_preview_layer(view_layer, MA_FLAT); } else { - set_preview_layer(scene_layer, MA_SPHERE_A); + set_preview_layer(view_layer, MA_SPHERE_A); /* same as above, use current scene world to light sphere */ if (BKE_scene_use_new_shading_nodes(scene)) @@ -474,7 +474,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty } } else { - set_preview_layer(scene_layer, mat->pr_type); + set_preview_layer(view_layer, mat->pr_type); if (mat->nodetree && sp->pr_method == PR_NODE_RENDER) { /* two previews, they get copied by wmJob */ @@ -488,7 +488,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty } - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { if (base->object->id.name[2] == 'p') { /* copy over object color, in case material uses it */ copy_v4_v4(base->object->col, sp->col); @@ -515,9 +515,9 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty sp->texcopy = tex; BLI_addtail(&pr_main->tex, tex); } - set_preview_layer(scene_layer, MA_TEXTURE); + set_preview_layer(view_layer, MA_TEXTURE); - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { if (base->object->id.name[2] == 't') { Material *mat = give_current_material(base->object, base->object->actcol); if (mat && mat->mtex[0]) { @@ -558,21 +558,21 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty if (!BKE_scene_use_new_shading_nodes(scene)) { if (la && la->type == LA_SUN && (la->sun_effect_type & LA_SUN_EFFECT_SKY)) { - set_preview_layer(scene_layer, MA_ATMOS); + set_preview_layer(view_layer, MA_ATMOS); sce->world = preview_get_localized_world(sp, scene->world); sce->camera = (Object *)BLI_findstring(&pr_main->object, "CameraAtmo", offsetof(ID, name) + 2); } else { sce->world = NULL; sce->camera = (Object *)BLI_findstring(&pr_main->object, "Camera", offsetof(ID, name) + 2); - set_preview_layer(scene_layer, MA_LAMP); + set_preview_layer(view_layer, MA_LAMP); } } else { - set_preview_layer(scene_layer, MA_LAMP); + set_preview_layer(view_layer, MA_LAMP); } - for (Base *base = scene_layer->object_bases.first; base; base = base->next) { + for (Base *base = view_layer->object_bases.first; base; base = base->next) { if (base->object->id.name[2] == 'p') { if (base->object->type == OB_LAMP) base->object->data = la; @@ -594,7 +594,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty BLI_addtail(&pr_main->world, wrld); } - set_preview_layer(scene_layer, MA_SKY); + set_preview_layer(view_layer, MA_SKY); sce->world = wrld; if (wrld && wrld->nodetree && sp->pr_method == PR_NODE_RENDER) { @@ -604,11 +604,11 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty } } - Depsgraph *depsgraph = BKE_scene_get_depsgraph(sce, scene_layer, true); + Depsgraph *depsgraph = BKE_scene_get_depsgraph(sce, view_layer, true); /* TODO(sergey): Use proper flag for tagging here. */ DEG_graph_id_tag_update(pr_main, depsgraph, &sce->id, 0); DEG_relations_tag_update(pr_main); - BKE_scene_graph_update_tagged(pr_main->eval_ctx, depsgraph, pr_main, sce, scene_layer); + BKE_scene_graph_update_tagged(pr_main->eval_ctx, depsgraph, pr_main, sce, view_layer); return sce; } diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index a98751176fc..04604feab6a 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -624,12 +624,12 @@ void WORLD_OT_new(wmOperatorType *ot) /********************** render layer operators *********************/ -static int render_layer_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int view_layer_add_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - BKE_scene_layer_add(scene, NULL); - scene->active_layer = BLI_listbase_count(&scene->render_layers) - 1; + BKE_view_layer_add(scene, NULL); + scene->active_view_layer = BLI_listbase_count(&scene->view_layers) - 1; DEG_id_tag_update(&scene->id, 0); DEG_relations_tag_update(CTX_data_main(C)); @@ -638,27 +638,27 @@ static int render_layer_add_exec(bContext *C, wmOperator *UNUSED(op)) return OPERATOR_FINISHED; } -void SCENE_OT_render_layer_add(wmOperatorType *ot) +void SCENE_OT_view_layer_add(wmOperatorType *ot) { /* identifiers */ - ot->name = "Add Render Layer"; - ot->idname = "SCENE_OT_render_layer_add"; - ot->description = "Add a render layer"; + ot->name = "Add View Layer"; + ot->idname = "SCENE_OT_view_layer_add"; + ot->description = "Add a view layer"; /* api callbacks */ - ot->exec = render_layer_add_exec; + ot->exec = view_layer_add_exec; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL; } -static int render_layer_remove_exec(bContext *C, wmOperator *UNUSED(op)) +static int view_layer_remove_exec(bContext *C, wmOperator *UNUSED(op)) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BKE_scene_layer_from_scene_get(scene); + ViewLayer *view_layer = BKE_view_layer_from_scene_get(scene); - if (!ED_scene_render_layer_delete(bmain, scene, scene_layer, NULL)) { + if (!ED_scene_view_layer_delete(bmain, scene, view_layer, NULL)) { return OPERATOR_CANCELLED; } @@ -667,15 +667,15 @@ static int render_layer_remove_exec(bContext *C, wmOperator *UNUSED(op)) return OPERATOR_FINISHED; } -void SCENE_OT_render_layer_remove(wmOperatorType *ot) +void SCENE_OT_view_layer_remove(wmOperatorType *ot) { /* identifiers */ - ot->name = "Remove Render Layer"; - ot->idname = "SCENE_OT_render_layer_remove"; - ot->description = "Remove the selected render layer"; + ot->name = "Remove View Layer"; + ot->idname = "SCENE_OT_view_layer_remove"; + ot->description = "Remove the selected view layer"; /* api callbacks */ - ot->exec = render_layer_remove_exec; + ot->exec = view_layer_remove_exec; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL; @@ -772,9 +772,9 @@ static int freestyle_active_module_poll(bContext *C) static int freestyle_module_add_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); - BKE_freestyle_module_add(&scene_layer->freestyle_config); + BKE_freestyle_module_add(&view_layer->freestyle_config); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); @@ -798,11 +798,11 @@ void SCENE_OT_freestyle_module_add(wmOperatorType *ot) static int freestyle_module_remove_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); PointerRNA ptr = CTX_data_pointer_get_type(C, "freestyle_module", &RNA_FreestyleModuleSettings); FreestyleModuleConfig *module = ptr.data; - BKE_freestyle_module_delete(&scene_layer->freestyle_config, module); + BKE_freestyle_module_delete(&view_layer->freestyle_config, module); DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); @@ -828,12 +828,12 @@ void SCENE_OT_freestyle_module_remove(wmOperatorType *ot) static int freestyle_module_move_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); PointerRNA ptr = CTX_data_pointer_get_type(C, "freestyle_module", &RNA_FreestyleModuleSettings); FreestyleModuleConfig *module = ptr.data; int dir = RNA_enum_get(op->ptr, "direction"); - if (BKE_freestyle_module_move(&scene_layer->freestyle_config, module, dir)) { + if (BKE_freestyle_module_move(&view_layer->freestyle_config, module, dir)) { DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); } @@ -870,9 +870,9 @@ static int freestyle_lineset_add_exec(bContext *C, wmOperator *UNUSED(op)) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); - BKE_freestyle_lineset_add(bmain, &scene_layer->freestyle_config, NULL); + BKE_freestyle_lineset_add(bmain, &view_layer->freestyle_config, NULL); DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); @@ -897,21 +897,21 @@ void SCENE_OT_freestyle_lineset_add(wmOperatorType *ot) static int freestyle_active_lineset_poll(bContext *C) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); - if (!scene_layer) { + if (!view_layer) { return false; } - return BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config) != NULL; + return BKE_freestyle_lineset_get_active(&view_layer->freestyle_config) != NULL; } static int freestyle_lineset_copy_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); - FRS_copy_active_lineset(&scene_layer->freestyle_config); + FRS_copy_active_lineset(&view_layer->freestyle_config); return OPERATOR_FINISHED; } @@ -934,9 +934,9 @@ void SCENE_OT_freestyle_lineset_copy(wmOperatorType *ot) static int freestyle_lineset_paste_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); - FRS_paste_active_lineset(&scene_layer->freestyle_config); + FRS_paste_active_lineset(&view_layer->freestyle_config); DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); @@ -962,9 +962,9 @@ void SCENE_OT_freestyle_lineset_paste(wmOperatorType *ot) static int freestyle_lineset_remove_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); - FRS_delete_active_lineset(&scene_layer->freestyle_config); + FRS_delete_active_lineset(&view_layer->freestyle_config); DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); @@ -990,10 +990,10 @@ void SCENE_OT_freestyle_lineset_remove(wmOperatorType *ot) static int freestyle_lineset_move_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); int dir = RNA_enum_get(op->ptr, "direction"); - if (FRS_move_active_lineset(&scene_layer->freestyle_config, dir)) { + if (FRS_move_active_lineset(&view_layer->freestyle_config, dir)) { DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); } @@ -1030,8 +1030,8 @@ static int freestyle_linestyle_new_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); if (!lineset) { BKE_report(op->reports, RPT_ERROR, "No active lineset to add a new line style to"); @@ -1068,8 +1068,8 @@ void SCENE_OT_freestyle_linestyle_new(wmOperatorType *ot) static int freestyle_color_modifier_add_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); int type = RNA_enum_get(op->ptr, "type"); if (!freestyle_linestyle_check_report(lineset, op->reports)) { @@ -1108,8 +1108,8 @@ void SCENE_OT_freestyle_color_modifier_add(wmOperatorType *ot) static int freestyle_alpha_modifier_add_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); int type = RNA_enum_get(op->ptr, "type"); if (!freestyle_linestyle_check_report(lineset, op->reports)) { @@ -1148,8 +1148,8 @@ void SCENE_OT_freestyle_alpha_modifier_add(wmOperatorType *ot) static int freestyle_thickness_modifier_add_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); int type = RNA_enum_get(op->ptr, "type"); if (!freestyle_linestyle_check_report(lineset, op->reports)) { @@ -1188,8 +1188,8 @@ void SCENE_OT_freestyle_thickness_modifier_add(wmOperatorType *ot) static int freestyle_geometry_modifier_add_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); int type = RNA_enum_get(op->ptr, "type"); if (!freestyle_linestyle_check_report(lineset, op->reports)) { @@ -1241,8 +1241,8 @@ static int freestyle_get_modifier_type(PointerRNA *ptr) static int freestyle_modifier_remove_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_LineStyleModifier); LineStyleModifier *modifier = ptr.data; @@ -1291,8 +1291,8 @@ void SCENE_OT_freestyle_modifier_remove(wmOperatorType *ot) static int freestyle_modifier_copy_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_LineStyleModifier); LineStyleModifier *modifier = ptr.data; @@ -1341,8 +1341,8 @@ void SCENE_OT_freestyle_modifier_copy(wmOperatorType *ot) static int freestyle_modifier_move_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_LineStyleModifier); LineStyleModifier *modifier = ptr.data; int dir = RNA_enum_get(op->ptr, "direction"); diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c index f38b190b92c..ec89e32cfaa 100644 --- a/source/blender/editors/render/render_update.c +++ b/source/blender/editors/render/render_update.c @@ -396,7 +396,7 @@ static void texture_changed(Main *bmain, Tex *tex) Lamp *la; World *wo; Scene *scene; - SceneLayer *sl; + ViewLayer *sl; Object *ob; bNode *node; bool texture_draw = false; @@ -406,7 +406,7 @@ static void texture_changed(Main *bmain, Tex *tex) /* paint overlays */ for (scene = bmain->scene.first; scene; scene = scene->id.next) { - for (sl = scene->render_layers.first; sl; sl = sl->next) { + for (sl = scene->view_layers.first; sl; sl = sl->next) { BKE_paint_invalidate_overlay_tex(scene, sl, tex); } } diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c index 0ff77701eec..c7f04a0e2f9 100644 --- a/source/blender/editors/scene/scene_edit.c +++ b/source/blender/editors/scene/scene_edit.c @@ -123,11 +123,11 @@ void ED_scene_changed_update(Main *bmain, bContext *C, Scene *scene_new, const b /* XXX Just using active scene render-layer for workspace when switching, * but workspace should remember the last one set. Could store render-layer * per window-workspace combination (using WorkSpaceDataRelation) */ - SceneLayer *layer_new = BLI_findlink(&scene_new->render_layers, scene_new->active_layer); + ViewLayer *layer_new = BLI_findlink(&scene_new->view_layers, scene_new->active_view_layer); Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene_new, layer_new, true); CTX_data_scene_set(C, scene_new); - BKE_workspace_render_layer_set(CTX_wm_workspace(C), layer_new); + BKE_workspace_view_layer_set(CTX_wm_workspace(C), layer_new); BKE_scene_set_background(bmain, scene_new); DEG_graph_relations_update(depsgraph, bmain, scene_new, layer_new); DEG_on_visible_update(bmain, false); @@ -140,16 +140,16 @@ void ED_scene_changed_update(Main *bmain, bContext *C, Scene *scene_new, const b WM_event_add_notifier(C, NC_WINDOW, NULL); } -static bool scene_render_layer_remove_poll( - const Scene *scene, const SceneLayer *layer) +static bool view_layer_remove_poll( + const Scene *scene, const ViewLayer *layer) { - const int act = BLI_findindex(&scene->render_layers, layer); + const int act = BLI_findindex(&scene->view_layers, layer); if (act == -1) { return false; } - else if ((scene->render_layers.first == scene->render_layers.last) && - (scene->render_layers.first == layer)) + else if ((scene->view_layers.first == scene->view_layers.last) && + (scene->view_layers.first == layer)) { /* ensure 1 layer is kept */ return false; @@ -158,9 +158,9 @@ static bool scene_render_layer_remove_poll( return true; } -static void scene_render_layer_remove_unset_nodetrees(const Main *bmain, Scene *scene, SceneLayer *layer) +static void view_layer_remove_unset_nodetrees(const Main *bmain, Scene *scene, ViewLayer *layer) { - int act_layer_index = BLI_findindex(&scene->render_layers, layer); + int act_layer_index = BLI_findindex(&scene->view_layers, layer); for (Scene *sce = bmain->scene.first; sce; sce = sce->id.next) { if (sce->nodetree) { @@ -169,27 +169,27 @@ static void scene_render_layer_remove_unset_nodetrees(const Main *bmain, Scene * } } -bool ED_scene_render_layer_delete( - Main *bmain, Scene *scene, SceneLayer *layer, +bool ED_scene_view_layer_delete( + Main *bmain, Scene *scene, ViewLayer *layer, ReportList *reports) { - if (scene_render_layer_remove_poll(scene, layer) == false) { + if (view_layer_remove_poll(scene, layer) == false) { if (reports) { - BKE_reportf(reports, RPT_ERROR, "Render layer '%s' could not be removed from scene '%s'", + BKE_reportf(reports, RPT_ERROR, "View layer '%s' could not be removed from scene '%s'", layer->name, scene->id.name + 2); } return false; } - BLI_remlink(&scene->render_layers, layer); - BLI_assert(BLI_listbase_is_empty(&scene->render_layers) == false); - scene->active_layer = 0; + BLI_remlink(&scene->view_layers, layer); + BLI_assert(BLI_listbase_is_empty(&scene->view_layers) == false); + scene->active_view_layer = 0; - ED_workspace_render_layer_unset(bmain, layer, scene->render_layers.first); - scene_render_layer_remove_unset_nodetrees(bmain, scene, layer); + ED_workspace_view_layer_unset(bmain, layer, scene->view_layers.first); + view_layer_remove_unset_nodetrees(bmain, scene, layer); - BKE_scene_layer_free(layer); + BKE_view_layer_free(layer); DEG_id_tag_update(&scene->id, 0); DEG_relations_tag_update(bmain); diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index b8575b2da2a..559ef07c488 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -65,7 +65,7 @@ #include "screen_intern.h" const char *screen_context_dir[] = { - "scene", "render_layer", "visible_objects", "visible_bases", "selectable_objects", "selectable_bases", + "scene", "view_layer", "visible_objects", "visible_bases", "selectable_objects", "selectable_bases", "selected_objects", "selected_bases", "editable_objects", "editable_bases", "selected_editable_objects", "selected_editable_bases", @@ -89,7 +89,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult ScrArea *sa = CTX_wm_area(C); Scene *scene = WM_window_get_active_scene(win); WorkSpace *workspace = BKE_workspace_active_get(win->workspace_hook); - SceneLayer *sl = BKE_scene_layer_from_workspace_get(scene, workspace); + ViewLayer *sl = BKE_view_layer_from_workspace_get(scene, workspace); Object *obedit = scene->obedit; Object *obact = sl->basact ? sl->basact->object : NULL; diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index dfe2942868f..b702edf8864 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1303,13 +1303,13 @@ bool ED_screen_change(bContext *C, bScreen *sc) return false; } -static void screen_set_3dview_camera(Scene *scene, SceneLayer *scene_layer, ScrArea *sa, View3D *v3d) +static void screen_set_3dview_camera(Scene *scene, ViewLayer *view_layer, ScrArea *sa, View3D *v3d) { /* fix any cameras that are used in the 3d view but not in the scene */ BKE_screen_view3d_sync(v3d, scene); - if (!v3d->camera || !BKE_scene_layer_base_find(scene_layer, v3d->camera)) { - v3d->camera = BKE_scene_layer_camera_find(scene_layer); + if (!v3d->camera || !BKE_view_layer_base_find(view_layer, v3d->camera)) { + v3d->camera = BKE_view_layer_camera_find(view_layer); // XXX if (sc == curscreen) handle_view3d_lock(); if (!v3d->camera) { ARegion *ar; @@ -1333,13 +1333,13 @@ static void screen_set_3dview_camera(Scene *scene, SceneLayer *scene_layer, ScrA } } -void ED_screen_update_after_scene_change(const bScreen *screen, Scene *scene_new, SceneLayer *scene_layer) +void ED_screen_update_after_scene_change(const bScreen *screen, Scene *scene_new, ViewLayer *view_layer) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { View3D *v3d = (View3D *)sl; - screen_set_3dview_camera(scene_new, scene_layer, sa, v3d); + screen_set_3dview_camera(scene_new, view_layer, sa, v3d); } } } @@ -1727,7 +1727,7 @@ void ED_screen_animation_timer_update(bScreen *screen, int redraws, int refresh) } /* results in fully updated anim system */ -void ED_update_for_newframe(Main *bmain, Scene *scene, SceneLayer *scene_layer, struct Depsgraph *depsgraph) +void ED_update_for_newframe(Main *bmain, Scene *scene, ViewLayer *view_layer, struct Depsgraph *depsgraph) { #ifdef DURIAN_CAMERA_SWITCH void *camera = BKE_scene_camera_switch_find(scene); @@ -1744,7 +1744,7 @@ void ED_update_for_newframe(Main *bmain, Scene *scene, SceneLayer *scene_layer, ED_clip_update_frame(bmain, scene->r.cfra); /* this function applies the changes too */ - BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, view_layer); /* composite */ if (scene->use_nodes && scene->nodetree) diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index cb53de23983..d4a424f8c38 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -574,7 +574,7 @@ int ED_operator_mask(bContext *C) case SPACE_IMAGE: { SpaceImage *sima = sa->spacedata.first; - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); return ED_space_image_check_show_maskedit(sl, sima); } } @@ -3408,7 +3408,7 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv if (screen->animtimer && screen->animtimer == event->customdata) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); struct Depsgraph *depsgraph = CTX_data_depsgraph(C); wmTimer *wt = screen->animtimer; ScreenAnimData *sad = wt->customdata; @@ -3520,7 +3520,7 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv } /* since we follow drawflags, we can't send notifier but tag regions ourselves */ - ED_update_for_newframe(bmain, scene, scene_layer, depsgraph); + ED_update_for_newframe(bmain, scene, view_layer, depsgraph); for (window = wm->windows.first; window; window = window->next) { const bScreen *win_screen = WM_window_get_active_screen(window); diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c index e90c63f7a45..15596bbece0 100644 --- a/source/blender/editors/screen/workspace_edit.c +++ b/source/blender/editors/screen/workspace_edit.c @@ -71,7 +71,7 @@ * \{ */ WorkSpace *ED_workspace_add( - Main *bmain, const char *name, SceneLayer *act_render_layer, ViewRender *view_render) + Main *bmain, const char *name, ViewLayer *act_view_layer, ViewRender *view_render) { WorkSpace *workspace = BKE_workspace_add(bmain, name); @@ -79,7 +79,7 @@ WorkSpace *ED_workspace_add( BKE_workspace_object_mode_set(workspace, OB_MODE_OBJECT); #endif - BKE_workspace_render_layer_set(workspace, act_render_layer); + BKE_workspace_view_layer_set(workspace, act_view_layer); BKE_viewrender_copy(&workspace->view_render, view_render); return workspace; @@ -104,11 +104,11 @@ static void workspace_change_update_mode( } #endif -static void workspace_change_update_render_layer( +static void workspace_change_update_view_layer( WorkSpace *workspace_new, const WorkSpace *workspace_old) { - if (!BKE_workspace_render_layer_get(workspace_new)) { - BKE_workspace_render_layer_set(workspace_new, BKE_workspace_render_layer_get(workspace_old)); + if (!BKE_workspace_view_layer_get(workspace_new)) { + BKE_workspace_view_layer_set(workspace_new, BKE_workspace_view_layer_get(workspace_old)); } } @@ -117,7 +117,7 @@ static void workspace_change_update( bContext *C, wmWindowManager *wm) { /* needs to be done before changing mode! (to ensure right context) */ - workspace_change_update_render_layer(workspace_new, workspace_old); + workspace_change_update_view_layer(workspace_new, workspace_old); #ifdef USE_WORKSPACE_MODE workspace_change_update_mode(workspace_old, workspace_new, C, CTX_data_active_object(C), &wm->reports); #else @@ -199,7 +199,7 @@ bool ED_workspace_change( screen_changed_update(C, win, screen_new); workspace_change_update(workspace_new, workspace_old, C, wm); - BLI_assert(BKE_workspace_render_layer_get(workspace_new) != NULL); + BLI_assert(BKE_workspace_view_layer_get(workspace_new) != NULL); BLI_assert(CTX_wm_workspace(C) == workspace_new); return true; @@ -219,7 +219,7 @@ WorkSpace *ED_workspace_duplicate( ListBase *layouts_old = BKE_workspace_layouts_get(workspace_old); WorkSpace *workspace_new = ED_workspace_add( bmain, workspace_old->id.name + 2, - BKE_workspace_render_layer_get(workspace_old), + BKE_workspace_view_layer_get(workspace_old), &workspace_old->view_render); ListBase *transform_orientations_old = BKE_workspace_transform_orientations_get(workspace_old); ListBase *transform_orientations_new = BKE_workspace_transform_orientations_get(workspace_new); @@ -273,12 +273,12 @@ void ED_workspace_scene_data_sync( BKE_screen_view3d_scene_sync(screen, scene); } -void ED_workspace_render_layer_unset( - const Main *bmain, const SceneLayer *layer_unset, SceneLayer *layer_new) +void ED_workspace_view_layer_unset( + const Main *bmain, const ViewLayer *layer_unset, ViewLayer *layer_new) { for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) { - if (BKE_workspace_render_layer_get(workspace) == layer_unset) { - BKE_workspace_render_layer_set(workspace, layer_new); + if (BKE_workspace_view_layer_get(workspace) == layer_unset) { + BKE_workspace_view_layer_set(workspace, layer_new); } } } diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 92ab30f7f3d..5ba753ff6af 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -765,7 +765,7 @@ static PaintOperation *texture_paint_init(bContext *C, wmOperator *op, const flo /* initialize from context */ if (CTX_wm_region_view3d(C)) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = OBACT(sl); bool uvs, mat, tex, stencil; if (!BKE_paint_proj_mesh_data_check(scene, ob, &uvs, &mat, &tex, &stencil)) { diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 2f4a28963fe..9ff848783f3 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -5321,7 +5321,7 @@ static int texture_paint_camera_project_exec(bContext *C, wmOperator *op) { Image *image = BLI_findlink(&CTX_data_main(C)->image, RNA_enum_get(op->ptr, "image")); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); ProjPaintState ps = {NULL}; int orig_brush_size; IDProperty *idgroup; @@ -5455,7 +5455,7 @@ static int texture_paint_image_from_view_exec(bContext *C, wmOperator *op) char filename[FILE_MAX]; Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); EvaluationContext eval_ctx; ToolSettings *settings = scene->toolsettings; int w = settings->imapaint.screen_grab_size[0]; @@ -5473,7 +5473,7 @@ static int texture_paint_image_from_view_exec(bContext *C, wmOperator *op) if (h > maxsize) h = maxsize; ibuf = ED_view3d_draw_offscreen_imbuf( - &eval_ctx, scene, scene_layer, CTX_wm_view3d(C), CTX_wm_region(C), + &eval_ctx, scene, view_layer, CTX_wm_view3d(C), CTX_wm_region(C), w, h, IB_rect, false, R_ALPHAPREMUL, 0, false, NULL, NULL, NULL, err_out); if (!ibuf) { diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index 6eadf373da4..0a8dd70480d 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -452,7 +452,7 @@ void paint_sample_color(bContext *C, ARegion *ar, int x, int y, bool texpaint_pr if (CTX_wm_view3d(C) && texpaint_proj) { /* first try getting a colour directly from the mesh faces if possible */ - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = OBACT(sl); bool sample_success = false; ImagePaintSettings *imapaint = &scene->toolsettings->imapaint; @@ -567,7 +567,7 @@ static int brush_curve_preset_exec(bContext *C, wmOperator *op) if (br) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); BKE_brush_curve_preset(br, RNA_enum_get(op->ptr, "shape")); BKE_paint_invalidate_cursor_overlay(scene, sl, br->curve); } diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 4fed7c4467e..daeb7823a43 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -311,7 +311,7 @@ static int sound_bake_animation_exec(bContext *C, wmOperator *UNUSED(op)) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); struct Depsgraph *depsgraph = CTX_data_depsgraph(C); int oldfra = scene->r.cfra; int cfra; @@ -320,11 +320,11 @@ static int sound_bake_animation_exec(bContext *C, wmOperator *UNUSED(op)) for (cfra = (scene->r.sfra > 0) ? (scene->r.sfra - 1) : 0; cfra <= scene->r.efra + 1; cfra++) { scene->r.cfra = cfra; - BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, view_layer); } scene->r.cfra = oldfra; - BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, view_layer); return OPERATOR_FINISHED; } diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 392efd03ee1..5a9fbd0e0c4 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -186,7 +186,7 @@ static int buttons_context_path_collection(ButsContextPath *path) return 1; } - SceneLayer *sl = ptr->data; + ViewLayer *sl = ptr->data; LayerCollection *sc = BKE_layer_collection_get_active(sl); if (sc) { @@ -208,7 +208,7 @@ static int buttons_context_path_object(ButsContextPath *path) return 1; } - SceneLayer *sl = ptr->data; + ViewLayer *sl = ptr->data; Object *ob = (sl->basact) ? sl->basact->object : NULL; if (ob) { @@ -411,7 +411,7 @@ static int buttons_context_path_brush(const bContext *C, ButsContextPath *path) scene = path->ptr[path->len - 1].data; if (scene) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); br = BKE_paint_brush(BKE_paint_get_active(scene, sl)); } @@ -561,7 +561,7 @@ static int buttons_context_path_texture(const bContext *C, ButsContextPath *path static bool buttons_context_linestyle_pinnable(const bContext *C) { Scene *scene = CTX_data_scene(C); - SceneLayer *active_scene_layer; + ViewLayer *active_view_layer; FreestyleConfig *config; SpaceButs *sbuts; @@ -570,8 +570,8 @@ static bool buttons_context_linestyle_pinnable(const bContext *C) return false; } /* if Freestyle is not in the Parameter Editor mode */ - active_scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - config = &active_scene_layer->freestyle_config; + active_view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + config = &active_view_layer->freestyle_config; if (config->mode != FREESTYLE_CONTROL_EDITOR_MODE) { return false; } @@ -608,7 +608,7 @@ static int buttons_context_path(const bContext *C, ButsContextPath *path, int ma /* No pinned root, use scene or workspace as initial root. */ else { if ((mainb != BCONTEXT_WORKSPACE) && (use_scene_settings || - ELEM(mainb, BCONTEXT_SCENE, BCONTEXT_RENDER, BCONTEXT_RENDER_LAYER, BCONTEXT_WORLD))) + ELEM(mainb, BCONTEXT_SCENE, BCONTEXT_RENDER, BCONTEXT_VIEW_LAYER, BCONTEXT_WORLD))) { RNA_id_pointer_create(&scene->id, &path->ptr[0]); path->len++; @@ -619,9 +619,9 @@ static int buttons_context_path(const bContext *C, ButsContextPath *path, int ma } } - if (!ELEM(mainb, BCONTEXT_WORKSPACE, BCONTEXT_SCENE, BCONTEXT_RENDER, BCONTEXT_RENDER_LAYER, BCONTEXT_WORLD)) { - SceneLayer *scene_layer = BKE_scene_layer_from_workspace_get(scene, workspace); - RNA_pointer_create(NULL, &RNA_SceneLayer, scene_layer, &path->ptr[path->len]); + if (!ELEM(mainb, BCONTEXT_WORKSPACE, BCONTEXT_SCENE, BCONTEXT_RENDER, BCONTEXT_VIEW_LAYER, BCONTEXT_WORLD)) { + ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace); + RNA_pointer_create(NULL, &RNA_ViewLayer, view_layer, &path->ptr[path->len]); path->len++; } @@ -632,7 +632,7 @@ static int buttons_context_path(const bContext *C, ButsContextPath *path, int ma case BCONTEXT_RENDER: found = buttons_context_path_scene(path); break; - case BCONTEXT_RENDER_LAYER: + case BCONTEXT_VIEW_LAYER: #ifdef WITH_FREESTYLE if (buttons_context_linestyle_pinnable(C)) { found = buttons_context_path_linestyle(path); @@ -1186,7 +1186,7 @@ void buttons_context_draw(const bContext *C, uiLayout *layout) name = RNA_struct_name_get_alloc(ptr, namebuf, sizeof(namebuf), NULL); if (name) { - if ((!ELEM(sbuts->mainb, BCONTEXT_RENDER, BCONTEXT_SCENE, BCONTEXT_RENDER_LAYER) && ptr->type == &RNA_Scene) || + if ((!ELEM(sbuts->mainb, BCONTEXT_RENDER, BCONTEXT_SCENE, BCONTEXT_VIEW_LAYER) && ptr->type == &RNA_Scene) || (!ELEM(sbuts->mainb, BCONTEXT_WORKSPACE) && ptr->type == &RNA_WorkSpace)) { uiItemLDrag(row, ptr, "", icon); /* save some space */ diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index 8a23c762b8c..036db87e846 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -109,14 +109,14 @@ bool ED_texture_context_check_linestyle(const bContext *C) { #ifdef WITH_FREESTYLE Scene *scene = CTX_data_scene(C); - SceneLayer *active_render_layer; + ViewLayer *active_view_layer; FreestyleConfig *config; FreestyleLineSet *lineset; FreestyleLineStyle *linestyle; if (scene && (scene->r.mode & R_EDGE_FRS)) { - active_render_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - config = &active_render_layer->freestyle_config; + active_view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + config = &active_view_layer->freestyle_config; if (config->mode == FREESTYLE_CONTROL_EDITOR_MODE) { lineset = BKE_freestyle_lineset_get_active(config); if (lineset) { @@ -196,7 +196,7 @@ static void set_texture_context(const bContext *C, SpaceButs *sbuts) else if ((sbuts->mainb == BCONTEXT_PARTICLE) && valid_particles) { sbuts->texture_context = sbuts->texture_context_prev = SB_TEXC_PARTICLES; } - else if ((sbuts->mainb == BCONTEXT_RENDER_LAYER) && valid_linestyle) { + else if ((sbuts->mainb == BCONTEXT_VIEW_LAYER) && valid_linestyle) { sbuts->texture_context = sbuts->texture_context_prev = SB_TEXC_LINESTYLE; } else if ((ELEM(sbuts->mainb, BCONTEXT_MODIFIER, BCONTEXT_PHYSICS)) && valid_others) { @@ -363,8 +363,8 @@ static void buttons_texture_users_from_context(ListBase *users, const bContext * if (!workspace) { workspace = CTX_wm_workspace(C); } - SceneLayer *scene_layer = BKE_scene_layer_from_workspace_get(scene, workspace); - ob = OBACT(scene_layer); + ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace); + ob = OBACT(view_layer); } if (ob && ob->type == OB_LAMP && !la) diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 3607f817721..74b20360a53 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -147,8 +147,8 @@ static void buttons_main_region_draw(const bContext *C, ARegion *ar) ED_region_panels(C, ar, "scene", sbuts->mainb, vertical); else if (sbuts->mainb == BCONTEXT_RENDER) ED_region_panels(C, ar, "render", sbuts->mainb, vertical); - else if (sbuts->mainb == BCONTEXT_RENDER_LAYER) - ED_region_panels(C, ar, "render_layer", sbuts->mainb, vertical); + else if (sbuts->mainb == BCONTEXT_VIEW_LAYER) + ED_region_panels(C, ar, "view_layer", sbuts->mainb, vertical); else if (sbuts->mainb == BCONTEXT_WORLD) ED_region_panels(C, ar, "world", sbuts->mainb, vertical); else if (sbuts->mainb == BCONTEXT_WORKSPACE) @@ -248,7 +248,7 @@ static void buttons_area_listener( switch (wmn->data) { case ND_RENDER_OPTIONS: buttons_area_redraw(sa, BCONTEXT_RENDER); - buttons_area_redraw(sa, BCONTEXT_RENDER_LAYER); + buttons_area_redraw(sa, BCONTEXT_VIEW_LAYER); break; case ND_WORLD: buttons_area_redraw(sa, BCONTEXT_WORLD); diff --git a/source/blender/editors/space_clip/tracking_ops_orient.c b/source/blender/editors/space_clip/tracking_ops_orient.c index e62b6499dea..8fd09a4971f 100644 --- a/source/blender/editors/space_clip/tracking_ops_orient.c +++ b/source/blender/editors/space_clip/tracking_ops_orient.c @@ -88,7 +88,7 @@ static Object *get_camera_with_movieclip(Scene *scene, MovieClip *clip) static Object *get_orientation_object(bContext *C) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); SpaceClip *sc = CTX_wm_space_clip(C); MovieClip *clip = ED_space_clip_get_clip(sc); MovieTracking *tracking = &clip->tracking; @@ -113,7 +113,7 @@ static int set_orientation_poll(bContext *C) { SpaceClip *sc = CTX_wm_space_clip(C); if (sc != NULL) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); MovieClip *clip = ED_space_clip_get_clip(sc); if (clip != NULL) { MovieTracking *tracking = &clip->tracking; diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index e47a5427605..48c6fdcedde 100644 --- a/source/blender/editors/space_image/image_edit.c +++ b/source/blender/editors/space_image/image_edit.c @@ -374,7 +374,7 @@ bool ED_space_image_show_uvedit(SpaceImage *sima, Object *obedit) } /* matches clip function */ -bool ED_space_image_check_show_maskedit(SceneLayer *sl, SpaceImage *sima) +bool ED_space_image_check_show_maskedit(ViewLayer *sl, SpaceImage *sima) { /* check editmode - this is reserved for UV editing */ Object *ob = OBACT(sl); @@ -390,7 +390,7 @@ int ED_space_image_maskedit_poll(bContext *C) SpaceImage *sima = CTX_wm_space_image(C); if (sima) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); return ED_space_image_check_show_maskedit(sl, sima); } diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h index 52d04ad4956..47d6257366c 100644 --- a/source/blender/editors/space_image/image_intern.h +++ b/source/blender/editors/space_image/image_intern.h @@ -90,7 +90,7 @@ void IMAGE_OT_curves_point_set(struct wmOperatorType *ot); void IMAGE_OT_change_frame(struct wmOperatorType *ot); -void IMAGE_OT_read_renderlayers(struct wmOperatorType *ot); +void IMAGE_OT_read_viewlayers(struct wmOperatorType *ot); void IMAGE_OT_render_border(struct wmOperatorType *ot); void IMAGE_OT_clear_render_border(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 906bbf74a96..49e5019b604 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -794,7 +794,7 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op)) SpaceImage *sima; ARegion *ar; Scene *scene; - SceneLayer *sl; + ViewLayer *sl; Object *obedit; Image *ima; @@ -802,7 +802,7 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op)) sima = CTX_wm_space_image(C); ar = CTX_wm_region(C); scene = CTX_data_scene(C); - sl = CTX_data_scene_layer(C); + sl = CTX_data_view_layer(C); obedit = CTX_data_edit_object(C); ima = ED_space_image(sima); @@ -3599,7 +3599,7 @@ void IMAGE_OT_change_frame(wmOperatorType *ot) /* Reload cached render results... */ /* goes over all scenes, reads render layers */ -static int image_read_renderlayers_exec(bContext *C, wmOperator *UNUSED(op)) +static int image_read_viewlayers_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); SpaceImage *sima = CTX_wm_space_image(C); @@ -3616,14 +3616,14 @@ static int image_read_renderlayers_exec(bContext *C, wmOperator *UNUSED(op)) return OPERATOR_FINISHED; } -void IMAGE_OT_read_renderlayers(wmOperatorType *ot) +void IMAGE_OT_read_viewlayers(wmOperatorType *ot) { - ot->name = "Read Render Layers"; - ot->idname = "IMAGE_OT_read_renderlayers"; - ot->description = "Read all the current scene's render layers from cache, as needed"; + ot->name = "Read View Layers"; + ot->idname = "IMAGE_OT_read_viewlayers"; + ot->description = "Read all the current scene's view layers from cache, as needed"; ot->poll = space_image_main_region_poll; - ot->exec = image_read_renderlayers_exec; + ot->exec = image_read_viewlayers_exec; /* flags */ ot->flag = 0; diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index fab98a14fc6..ffc66f50cc9 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -269,7 +269,7 @@ static void image_operatortypes(void) WM_operatortype_append(IMAGE_OT_change_frame); - WM_operatortype_append(IMAGE_OT_read_renderlayers); + WM_operatortype_append(IMAGE_OT_read_viewlayers); WM_operatortype_append(IMAGE_OT_render_border); WM_operatortype_append(IMAGE_OT_clear_render_border); } @@ -283,7 +283,7 @@ static void image_keymap(struct wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "IMAGE_OT_new", NKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "IMAGE_OT_open", OKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "IMAGE_OT_reload", RKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "IMAGE_OT_read_renderlayers", RKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "IMAGE_OT_read_viewlayers", RKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "IMAGE_OT_save", SKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "IMAGE_OT_save_as", F3KEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "IMAGE_OT_properties", NKEY, KM_PRESS, 0, 0); @@ -537,7 +537,7 @@ static void image_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Sc case ND_TRANSFORM: case ND_MODIFIER: { - SceneLayer *sl = BKE_scene_layer_from_workspace_get(scene, workspace); + ViewLayer *sl = BKE_view_layer_from_workspace_get(scene, workspace); Object *ob = OBACT(sl); if (ob && (ob == wmn->reference) && (ob->mode & OB_MODE_EDIT)) { if (sima->lock && (sima->flag & SI_DRAWSHADOW)) { @@ -721,7 +721,7 @@ static void image_main_region_draw(const bContext *C, ARegion *ar) Mask *mask = NULL; bool curve = false; Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); View2D *v2d = &ar->v2d; //View2DScrollers *scrollers; float col[3]; diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index 463195f74f7..79c7d90a127 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -345,7 +345,7 @@ static bool stats_is_object_dynamic_topology_sculpt(Object *ob) } /* Statistics displayed in info header. Called regularly on scene changes. */ -static void stats_update(Scene *scene, SceneLayer *sl) +static void stats_update(Scene *scene, ViewLayer *sl) { SceneStats stats = {0}; Object *ob = (sl->basact) ? sl->basact->object : NULL; @@ -378,7 +378,7 @@ static void stats_update(Scene *scene, SceneLayer *sl) *(sl->stats) = stats; } -static void stats_string(Scene *scene, SceneLayer *sl) +static void stats_string(Scene *scene, ViewLayer *sl) { #define MAX_INFO_MEM_LEN 64 SceneStats *stats = sl->stats; @@ -490,7 +490,7 @@ static void stats_string(Scene *scene, SceneLayer *sl) #undef MAX_INFO_LEN -void ED_info_stats_clear(SceneLayer *sl) +void ED_info_stats_clear(ViewLayer *sl) { if (sl->stats) { MEM_freeN(sl->stats); @@ -498,7 +498,7 @@ void ED_info_stats_clear(SceneLayer *sl) } } -const char *ED_info_stats_string(Scene *scene, SceneLayer *sl) +const char *ED_info_stats_string(Scene *scene, ViewLayer *sl) { if (!sl->stats) { stats_update(scene, sl); diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index 9851dcac231..244b10d9ec4 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -463,7 +463,7 @@ static ID **get_selected_and_linked_obs(bContext *C, short *count, short scavisf Base *base; Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob, *obt, *obact = CTX_data_active_object(C); ID **idar; bSensor *sens; diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index fc8c4b51635..89bf57fdb6c 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -124,7 +124,7 @@ static int mouse_nla_channels(bContext *C, bAnimContext *ac, float x, int channe } case ANIMTYPE_OBJECT: { - SceneLayer *scene_layer = ac->scene_layer; + ViewLayer *view_layer = ac->view_layer; Base *base = (Base *)ale->data; Object *ob = base->object; AnimData *adt = ob->adt; @@ -141,7 +141,7 @@ static int mouse_nla_channels(bContext *C, bAnimContext *ac, float x, int channe else { /* deselect all */ /* TODO: should this deselect all other types of channels too? */ - for (Base *b = scene_layer->object_bases.first; b; b = b->next) { + for (Base *b = view_layer->object_bases.first; b; b = b->next) { ED_object_base_select(b, BA_DESELECT); BKE_scene_object_base_flag_sync_from_base(b); if (b->object->adt) b->object->adt->flag &= ~(ADT_UI_SELECTED | ADT_UI_ACTIVE); diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index eff8ce6665b..c591433f7b1 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -1270,7 +1270,7 @@ static void node_composit_buts_image_ex(uiLayout *layout, bContext *C, PointerRN uiTemplateImage(layout, C, ptr, "image", &iuserptr, 0, 1); } -static void node_composit_buts_renderlayers(uiLayout *layout, bContext *C, PointerRNA *ptr) +static void node_composit_buts_viewlayers(uiLayout *layout, bContext *C, PointerRNA *ptr) { bNode *node = ptr->data; uiLayout *col, *row; @@ -2471,7 +2471,7 @@ static void node_composit_set_butfunc(bNodeType *ntype) ntype->draw_buttons_ex = node_composit_buts_image_ex; break; case CMP_NODE_R_LAYERS: - ntype->draw_buttons = node_composit_buts_renderlayers; + ntype->draw_buttons = node_composit_buts_viewlayers; break; case CMP_NODE_NORMAL: ntype->draw_buttons = node_buts_normal; diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 5a682338eee..94c31a7ddb7 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -700,12 +700,12 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node) for (scene = bmain->scene.first; scene; scene = scene->id.next) { if (scene->nodetree && scene->use_nodes && ntreeHasTree(scene->nodetree, ntree)) { if (node->id == NULL || node->id == (ID *)scene) { - int num_layers = BLI_listbase_count(&scene->render_layers); - scene->active_layer = node->custom1; + int num_layers = BLI_listbase_count(&scene->view_layers); + scene->active_view_layer = node->custom1; /* Clamp the value, because it might have come from a different * scene which could have more render layers than new one. */ - scene->active_layer = min_ff(scene->active_layer, num_layers - 1); + scene->active_view_layer = min_ff(scene->active_view_layer, num_layers - 1); } } } @@ -1276,7 +1276,7 @@ bool ED_node_select_check(ListBase *lb) /* goes over all scenes, reads render layers */ -static int node_read_renderlayers_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_read_viewlayers_exec(bContext *C, wmOperator *UNUSED(op)) { Main *bmain = CTX_data_main(C); SpaceNode *snode = CTX_wm_space_node(C); @@ -1306,14 +1306,14 @@ static int node_read_renderlayers_exec(bContext *C, wmOperator *UNUSED(op)) return OPERATOR_FINISHED; } -void NODE_OT_read_renderlayers(wmOperatorType *ot) +void NODE_OT_read_viewlayers(wmOperatorType *ot) { - ot->name = "Read Render Layers"; - ot->idname = "NODE_OT_read_renderlayers"; + ot->name = "Read View Layers"; + ot->idname = "NODE_OT_read_viewlayers"; ot->description = "Read all render layers of all used scenes"; - ot->exec = node_read_renderlayers_exec; + ot->exec = node_read_viewlayers_exec; ot->poll = composite_node_active; @@ -1366,13 +1366,13 @@ int node_render_changed_exec(bContext *C, wmOperator *UNUSED(op)) } } if (node) { - SceneLayer *scene_layer = BLI_findlink(&sce->render_layers, node->custom1); + ViewLayer *view_layer = BLI_findlink(&sce->view_layers, node->custom1); - if (scene_layer) { + if (view_layer) { PointerRNA op_ptr; WM_operator_properties_create(&op_ptr, "RENDER_OT_render"); - RNA_string_set(&op_ptr, "layer", scene_layer->name); + RNA_string_set(&op_ptr, "layer", view_layer->name); RNA_string_set(&op_ptr, "scene", sce->id.name + 2); /* to keep keypositions */ diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index 12e3c33007e..7138b63364a 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -197,7 +197,7 @@ void NODE_OT_options_toggle(struct wmOperatorType *ot); void NODE_OT_node_copy_color(struct wmOperatorType *ot); void NODE_OT_read_fullsamplelayers(struct wmOperatorType *ot); -void NODE_OT_read_renderlayers(struct wmOperatorType *ot); +void NODE_OT_read_viewlayers(struct wmOperatorType *ot); void NODE_OT_render_changed(struct wmOperatorType *ot); void NODE_OT_output_file_add_socket(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index 5118d52efc4..1859785173c 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -94,7 +94,7 @@ void node_operatortypes(void) WM_operatortype_append(NODE_OT_insert_offset); - WM_operatortype_append(NODE_OT_read_renderlayers); + WM_operatortype_append(NODE_OT_read_viewlayers); WM_operatortype_append(NODE_OT_read_fullsamplelayers); WM_operatortype_append(NODE_OT_render_changed); @@ -335,7 +335,7 @@ void node_keymap(struct wmKeyConfig *keyconf) kmi = WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, KM_CTRL, 0); RNA_boolean_set(kmi->ptr, "exit", true); - WM_keymap_add_item(keymap, "NODE_OT_read_renderlayers", RKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "NODE_OT_read_viewlayers", RKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "NODE_OT_read_fullsamplelayers", RKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "NODE_OT_render_changed", ZKEY, KM_PRESS, 0, 0); diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index 2f03935c999..24f42d58ac0 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -109,7 +109,7 @@ static SceneCollection *scene_collection_from_index(ListBase *lb, const int numb static int collection_link_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); SceneCollection *sc_master = BKE_collection_master(scene); SceneCollection *sc; @@ -202,7 +202,7 @@ void OUTLINER_OT_collection_link(wmOperatorType *ot) /** * Returns true if selected element is a collection directly - * linked to the active SceneLayer (not a nested collection) + * linked to the active ViewLayer (not a nested collection) */ static int collection_unlink_poll(bContext *C) { @@ -212,7 +212,7 @@ static int collection_unlink_poll(bContext *C) return 0; } - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); return BLI_findindex(&sl->layer_collections, lc) != -1 ? 1 : 0; } @@ -226,7 +226,7 @@ static int collection_unlink_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); BKE_collection_unlink(sl, lc); if (soops) { @@ -260,7 +260,7 @@ void OUTLINER_OT_collection_unlink(wmOperatorType *ot) static int collection_new_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); SceneCollection *sc = BKE_collection_add(scene, NULL, NULL); BKE_collection_link(sl, sc); @@ -382,7 +382,7 @@ void OUTLINER_OT_collections_delete(wmOperatorType *ot) static int collection_select_exec(bContext *C, wmOperator *op) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); const int collection_index = RNA_int_get(op->ptr, "collection_index"); sl->active_collection = collection_index; WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL); @@ -414,13 +414,13 @@ static int collection_toggle_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); int action = RNA_enum_get(op->ptr, "action"); LayerCollection *layer_collection = CTX_data_layer_collection(C); if (layer_collection->flag & COLLECTION_DISABLED) { if (ELEM(action, ACTION_TOGGLE, ACTION_ENABLE)) { - BKE_collection_enable(scene_layer, layer_collection); + BKE_collection_enable(view_layer, layer_collection); } else { /* ACTION_DISABLE */ BKE_reportf(op->reports, RPT_ERROR, "Layer collection %s already disabled", @@ -430,7 +430,7 @@ static int collection_toggle_exec(bContext *C, wmOperator *op) } else { if (ELEM(action, ACTION_TOGGLE, ACTION_DISABLE)) { - BKE_collection_disable(scene_layer, layer_collection); + BKE_collection_disable(view_layer, layer_collection); } else { /* ACTION_ENABLE */ BKE_reportf(op->reports, RPT_ERROR, "Layer collection %s already enabled", diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index c9e2a040af4..f849de0d127 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -252,16 +252,16 @@ static void enablebutton_collection_flag_cb(bContext *C, void *poin, void *poin2 Main *bmain = CTX_data_main(C); Scene *scene = poin; LayerCollection *layer_collection = poin2; - SceneLayer *scene_layer = BKE_scene_layer_find_from_collection(scene, layer_collection); + ViewLayer *view_layer = BKE_view_layer_find_from_collection(scene, layer_collection); /* We need to toggle the flag since this is called after the flag is already set. */ layer_collection->flag ^= COLLECTION_DISABLED; if (layer_collection->flag & COLLECTION_DISABLED) { - BKE_collection_enable(scene_layer, layer_collection); + BKE_collection_enable(view_layer, layer_collection); } else { - BKE_collection_disable(scene_layer, layer_collection); + BKE_collection_disable(view_layer, layer_collection); } DEG_relations_tag_update(bmain); @@ -300,7 +300,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname) { SpaceOops *soops = CTX_wm_space_outliner(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *obedit = CTX_data_edit_object(C); BLI_mempool *ts = soops->treestore; TreeStoreElem *tselem = tsep; @@ -464,7 +464,7 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar if (tselem->type == TSE_R_LAYER) { UI_block_emboss_set(block, UI_EMBOSS_NONE); - bt = uiDefIconButBitI(block, UI_BTYPE_ICON_TOGGLE, SCENE_LAYER_RENDER, 0, ICON_CHECKBOX_HLT - 1, + bt = uiDefIconButBitI(block, UI_BTYPE_ICON_TOGGLE, VIEW_LAYER_RENDER, 0, ICON_CHECKBOX_HLT - 1, (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX), te->ys, UI_UNIT_X, UI_UNIT_Y, te->directdata, 0, 0, 0, 0, TIP_("Render this RenderLayer")); UI_but_func_set(bt, restrictbutton_r_lay_cb, tselem->id, NULL); @@ -1239,7 +1239,7 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto #undef ICON_DRAW } -static void outliner_draw_iconrow(bContext *C, uiBlock *block, Scene *scene, SceneLayer *sl, SpaceOops *soops, +static void outliner_draw_iconrow(bContext *C, uiBlock *block, Scene *scene, ViewLayer *sl, SpaceOops *soops, ListBase *lb, int level, int xmax, int *offsx, int ys, float alpha_fac) { TreeElement *te; @@ -1325,7 +1325,7 @@ static void outliner_set_coord_tree_element(TreeElement *te, int startx, int sta static void outliner_draw_tree_element( - bContext *C, uiBlock *block, const uiFontStyle *fstyle, Scene *scene, SceneLayer *sl, + bContext *C, uiBlock *block, const uiFontStyle *fstyle, Scene *scene, ViewLayer *sl, ARegion *ar, SpaceOops *soops, TreeElement *te, bool draw_grayed_out, int startx, int *starty, TreeElement **te_edit, TreeElement **te_floating) { @@ -1766,7 +1766,7 @@ static void outliner_draw_highlights(ARegion *ar, SpaceOops *soops, int startx, } static void outliner_draw_tree( - bContext *C, uiBlock *block, Scene *scene, SceneLayer *sl, ARegion *ar, + bContext *C, uiBlock *block, Scene *scene, ViewLayer *sl, ARegion *ar, SpaceOops *soops, const bool has_restrict_icons, TreeElement **te_edit) { @@ -1888,7 +1888,7 @@ void draw_outliner(const bContext *C) { Main *mainvar = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); ARegion *ar = CTX_wm_region(C); View2D *v2d = &ar->v2d; SpaceOops *soops = CTX_wm_space_outliner(C); diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 5d0befece0d..3d89ee8e371 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -978,7 +978,7 @@ static int outliner_open_back(TreeElement *te) static int outliner_show_active_exec(bContext *C, wmOperator *UNUSED(op)) { SpaceOops *so = CTX_wm_space_outliner(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); ARegion *ar = CTX_wm_region(C); View2D *v2d = &ar->v2d; @@ -2174,8 +2174,8 @@ static int scene_drop_invoke(bContext *C, wmOperator *op, const wmEvent *event) BKE_collection_object_add(scene, sc, ob); - for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) { - Base *base = BKE_scene_layer_base_find(sl, ob); + for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) { + Base *base = BKE_view_layer_base_find(sl, ob); if (base) { ED_object_base_select(base, BA_SELECT); } diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index 1edb3c88396..db3c136892f 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -42,7 +42,7 @@ struct TreeStoreElem; struct Main; struct bContext; struct Scene; -struct SceneLayer; +struct ViewLayer; struct ID; struct Object; struct bPoseChannel; @@ -183,7 +183,7 @@ void outliner_free_tree(ListBase *lb); void outliner_cleanup_tree(struct SpaceOops *soops); void outliner_remove_treestore_element(struct SpaceOops *soops, TreeStoreElem *tselem); -void outliner_build_tree(struct Main *mainvar, struct Scene *scene, struct SceneLayer *sl, struct SpaceOops *soops); +void outliner_build_tree(struct Main *mainvar, struct Scene *scene, struct ViewLayer *sl, struct SpaceOops *soops); /* outliner_draw.c ---------------------------------------------- */ @@ -192,9 +192,9 @@ void restrictbutton_gr_restrict_flag(void *poin, void *poin2, int flag); /* outliner_select.c -------------------------------------------- */ eOLDrawState tree_element_type_active( - struct bContext *C, struct Scene *scene, struct SceneLayer *sl, struct SpaceOops *soops, + struct bContext *C, struct Scene *scene, struct ViewLayer *sl, struct SpaceOops *soops, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive); -eOLDrawState tree_element_active(struct bContext *C, struct Scene *scene, struct SceneLayer *sl, SpaceOops *soops, +eOLDrawState tree_element_active(struct bContext *C, struct Scene *scene, struct ViewLayer *sl, SpaceOops *soops, TreeElement *te, const eOLSetState set, const bool handle_all_types); void outliner_item_do_activate_from_tree_element( diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index f2aec1cfa52..8267aeabe30 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -75,7 +75,7 @@ /* Outliner Element Selection/Activation on Click */ static eOLDrawState tree_element_active_renderlayer( - bContext *C, Scene *UNUSED(scene), SceneLayer *UNUSED(sl), TreeElement *te, TreeStoreElem *tselem, const eOLSetState set) + bContext *C, Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *te, TreeStoreElem *tselem, const eOLSetState set) { Scene *sce; @@ -85,11 +85,11 @@ static eOLDrawState tree_element_active_renderlayer( sce = (Scene *)tselem->id; if (set != OL_SETSEL_NONE) { - sce->active_layer = tselem->nr; + sce->active_view_layer = tselem->nr; WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, sce); } else { - return sce->active_layer == tselem->nr; + return sce->active_view_layer == tselem->nr; } return OL_DRAWSEL_NONE; } @@ -99,7 +99,7 @@ static eOLDrawState tree_element_active_renderlayer( * CTRL+LMB: Select/Deselect object and all cildren * CTRL+SHIFT+LMB: Add/Remove object and all children */ -static void do_outliner_object_select_recursive(SceneLayer *sl, Object *ob_parent, bool select) +static void do_outliner_object_select_recursive(ViewLayer *sl, Object *ob_parent, bool select) { Base *base; @@ -137,7 +137,7 @@ static void do_outliner_ebone_select_recursive(bArmature *arm, EditBone *ebone_p } static eOLDrawState tree_element_set_active_object( - bContext *C, Scene *scene, SceneLayer *sl, SpaceOops *soops, + bContext *C, Scene *scene, ViewLayer *sl, SpaceOops *soops, TreeElement *te, const eOLSetState set, bool recursive) { TreeStoreElem *tselem = TREESTORE(te); @@ -166,7 +166,7 @@ static eOLDrawState tree_element_set_active_object( } /* find associated base in current scene */ - base = BKE_scene_layer_base_find(sl, ob); + base = BKE_view_layer_base_find(sl, ob); if (base) { if (set == OL_SETSEL_EXTEND) { @@ -178,7 +178,7 @@ static eOLDrawState tree_element_set_active_object( } else { /* deleselect all */ - BKE_scene_layer_base_deselect_all(sl); + BKE_view_layer_base_deselect_all(sl); ED_object_base_select(base, BA_SELECT); } @@ -200,7 +200,7 @@ static eOLDrawState tree_element_set_active_object( } static eOLDrawState tree_element_active_material( - bContext *C, Scene *UNUSED(scene), SceneLayer *sl, SpaceOops *soops, + bContext *C, Scene *UNUSED(scene), ViewLayer *sl, SpaceOops *soops, TreeElement *te, const eOLSetState set) { TreeElement *tes; @@ -253,7 +253,7 @@ static eOLDrawState tree_element_active_material( } static eOLDrawState tree_element_active_texture( - bContext *C, Scene *scene, SceneLayer *sl, SpaceOops *UNUSED(soops), + bContext *C, Scene *scene, ViewLayer *sl, SpaceOops *UNUSED(soops), TreeElement *te, const eOLSetState set) { TreeElement *tep; @@ -340,7 +340,7 @@ static eOLDrawState tree_element_active_texture( static eOLDrawState tree_element_active_lamp( - bContext *UNUSED(C), Scene *UNUSED(scene), SceneLayer *sl, SpaceOops *soops, + bContext *UNUSED(C), Scene *UNUSED(scene), ViewLayer *sl, SpaceOops *soops, TreeElement *te, const eOLSetState set) { Object *ob; @@ -363,7 +363,7 @@ static eOLDrawState tree_element_active_lamp( } static eOLDrawState tree_element_active_camera( - bContext *UNUSED(C), Scene *scene, SceneLayer *UNUSED(sl), SpaceOops *soops, + bContext *UNUSED(C), Scene *scene, ViewLayer *UNUSED(sl), SpaceOops *soops, TreeElement *te, const eOLSetState set) { Object *ob = (Object *)outliner_search_back(soops, te, ID_OB); @@ -376,7 +376,7 @@ static eOLDrawState tree_element_active_camera( } static eOLDrawState tree_element_active_world( - bContext *C, Scene *scene, SceneLayer *UNUSED(sl), SpaceOops *UNUSED(soops), + bContext *C, Scene *scene, ViewLayer *UNUSED(sl), SpaceOops *UNUSED(soops), TreeElement *te, const eOLSetState set) { TreeElement *tep; @@ -409,7 +409,7 @@ static eOLDrawState tree_element_active_world( } static eOLDrawState tree_element_active_defgroup( - bContext *C, SceneLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set) + bContext *C, ViewLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set) { Object *ob; @@ -432,7 +432,7 @@ static eOLDrawState tree_element_active_defgroup( } static eOLDrawState tree_element_active_posegroup( - bContext *C, Scene *UNUSED(scene), SceneLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set) + bContext *C, Scene *UNUSED(scene), ViewLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set) { Object *ob = (Object *)tselem->id; @@ -453,7 +453,7 @@ static eOLDrawState tree_element_active_posegroup( } static eOLDrawState tree_element_active_posechannel( - bContext *C, Scene *UNUSED(scene), SceneLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive) + bContext *C, Scene *UNUSED(scene), ViewLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive) { Object *ob = (Object *)tselem->id; bArmature *arm = ob->data; @@ -497,7 +497,7 @@ static eOLDrawState tree_element_active_posechannel( } static eOLDrawState tree_element_active_bone( - bContext *C, SceneLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive) + bContext *C, ViewLayer *sl, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive) { bArmature *arm = (bArmature *)tselem->id; Bone *bone = te->directdata; @@ -606,7 +606,7 @@ static eOLDrawState tree_element_active_ebone( } static eOLDrawState tree_element_active_modifier( - bContext *C, Scene *UNUSED(scene), SceneLayer *UNUSED(sl), TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set) + bContext *C, Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set) { if (set != OL_SETSEL_NONE) { Object *ob = (Object *)tselem->id; @@ -634,7 +634,7 @@ static eOLDrawState tree_element_active_psys( } static int tree_element_active_constraint( - bContext *C, Scene *UNUSED(scene), SceneLayer *UNUSED(sl), TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set) + bContext *C, Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set) { if (set != OL_SETSEL_NONE) { Object *ob = (Object *)tselem->id; @@ -647,7 +647,7 @@ static int tree_element_active_constraint( } static eOLDrawState tree_element_active_text( - bContext *UNUSED(C), Scene *UNUSED(scene), SceneLayer *UNUSED(sl), SpaceOops *UNUSED(soops), + bContext *UNUSED(C), Scene *UNUSED(scene), ViewLayer *UNUSED(sl), SpaceOops *UNUSED(soops), TreeElement *UNUSED(te), int UNUSED(set)) { // XXX removed @@ -655,10 +655,10 @@ static eOLDrawState tree_element_active_text( } static eOLDrawState tree_element_active_pose( - bContext *C, Scene *scene, SceneLayer *sl, TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set) + bContext *C, Scene *scene, ViewLayer *sl, TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set) { Object *ob = (Object *)tselem->id; - Base *base = BKE_scene_layer_base_find(sl, ob); + Base *base = BKE_view_layer_base_find(sl, ob); if (base == NULL) { /* Armature not instantiated in current scene (e.g. inside an appended group...). */ @@ -744,7 +744,7 @@ static eOLDrawState tree_element_active_sequence_dup( } static eOLDrawState tree_element_active_keymap_item( - bContext *UNUSED(C), Scene *UNUSED(scene), SceneLayer *UNUSED(sl), TreeElement *te, TreeStoreElem *UNUSED(tselem), const eOLSetState set) + bContext *UNUSED(C), Scene *UNUSED(scene), ViewLayer *UNUSED(sl), TreeElement *te, TreeStoreElem *UNUSED(tselem), const eOLSetState set) { wmKeyMapItem *kmi = te->directdata; @@ -780,7 +780,7 @@ static eOLDrawState tree_element_active_collection( /* don't allow selecting a scene collection, it can have multiple layer collection * instances (which one would the user want to be selected then?) */ else if (tselem->type == TSE_LAYER_COLLECTION) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); LayerCollection *lc = te->directdata; const int collection_index = BKE_layer_collection_findindex(sl, lc); @@ -795,7 +795,7 @@ static eOLDrawState tree_element_active_collection( /* ---------------------------------------------- */ /* generic call for ID data check or make/check active in UI */ -eOLDrawState tree_element_active(bContext *C, Scene *scene, SceneLayer *sl, SpaceOops *soops, TreeElement *te, +eOLDrawState tree_element_active(bContext *C, Scene *scene, ViewLayer *sl, SpaceOops *soops, TreeElement *te, const eOLSetState set, const bool handle_all_types) { switch (te->idcode) { @@ -826,7 +826,7 @@ eOLDrawState tree_element_active(bContext *C, Scene *scene, SceneLayer *sl, Spac * Generic call for non-id data to make/check active in UI */ eOLDrawState tree_element_type_active( - bContext *C, Scene *scene, SceneLayer *sl, SpaceOops *soops, + bContext *C, Scene *scene, ViewLayer *sl, SpaceOops *soops, TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive) { switch (tselem->type) { @@ -883,7 +883,7 @@ eOLDrawState tree_element_type_active( * Needed to run from operators accessed from a menu. */ static void do_outliner_item_activate_tree_element( - bContext *C, Scene *scene, SceneLayer *sl, SpaceOops *soops, + bContext *C, Scene *scene, ViewLayer *sl, SpaceOops *soops, TreeElement *te, TreeStoreElem *tselem, const bool extend, const bool recursive) { @@ -918,14 +918,14 @@ static void do_outliner_item_activate_tree_element( } for (gob = gr->gobject.first; gob; gob = gob->next) { - ED_object_base_select(BKE_scene_layer_base_find(sl, gob->ob), sel); + ED_object_base_select(BKE_view_layer_base_find(sl, gob->ob), sel); } } else { - BKE_scene_layer_base_deselect_all(sl); + BKE_view_layer_base_deselect_all(sl); for (gob = gr->gobject.first; gob; gob = gob->next) { - Base *base = BKE_scene_layer_base_find(sl, gob->ob); + Base *base = BKE_view_layer_base_find(sl, gob->ob); /* Object may not be in this scene */ if (base != NULL) { if ((base->flag & BASE_SELECTED) == 0) { @@ -1004,7 +1004,7 @@ void outliner_item_do_activate_from_tree_element( bool extend, bool recursive) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); SpaceOops *soops = CTX_wm_space_outliner(C); do_outliner_item_activate_tree_element( @@ -1044,7 +1044,7 @@ int outliner_item_do_activate_from_cursor( } else { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); /* the row may also contain children, if one is hovered we want this instead of current te */ TreeElement *activate_te = outliner_find_item_at_x_in_row(soops, te, view_mval[0]); TreeStoreElem *activate_tselem = TREESTORE(activate_te); diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 79122de70dd..93cb1c62d01 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -366,9 +366,9 @@ static void object_select_cb( bContext *C, ReportList *UNUSED(reports), Scene *UNUSED(scene), TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data)) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = (Object *)tselem->id; - Base *base = BKE_scene_layer_base_find(sl, ob); + Base *base = BKE_view_layer_base_find(sl, ob); if (base && ((base->flag & BASE_VISIBLED) != 0)) { base->flag |= BASE_SELECTED; @@ -388,9 +388,9 @@ static void object_deselect_cb( bContext *C, ReportList *UNUSED(reports), Scene *UNUSED(scene), TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data)) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = (Object *)tselem->id; - Base *base = BKE_scene_layer_base_find(sl, ob); + Base *base = BKE_view_layer_base_find(sl, ob); if (base) { base->flag &= ~BASE_SELECTED; @@ -522,18 +522,18 @@ static void group_linkobs2scene_cb( bContext *C, ReportList *UNUSED(reports), Scene *scene, TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data)) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); SceneCollection *sc = CTX_data_scene_collection(C); Group *group = (Group *)tselem->id; GroupObject *gob; Base *base; for (gob = group->gobject.first; gob; gob = gob->next) { - base = BKE_scene_layer_base_find(sl, gob->ob); + base = BKE_view_layer_base_find(sl, gob->ob); if (!base) { /* link to scene */ BKE_collection_object_add(scene, sc, gob->ob); - base = BKE_scene_layer_base_find(sl, gob->ob); + base = BKE_view_layer_base_find(sl, gob->ob); id_us_plus(&gob->ob->id); } @@ -848,14 +848,14 @@ static void collection_cb(int event, TreeElement *te, TreeStoreElem *UNUSED(tsel WM_event_add_notifier(C, NC_SCENE | ND_LAYER, scene); } else if (event == OL_COLLECTION_OP_COLLECTION_UNLINK) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); - if (BLI_findindex(&sl->layer_collections, lc) == -1) { + if (BLI_findindex(&view_layer->layer_collections, lc) == -1) { /* we can't unlink if the layer collection wasn't directly linked */ TODO_LAYER_OPERATORS; /* this shouldn't be in the menu in those cases */ } else { - BKE_collection_unlink(sl, lc); + BKE_collection_unlink(view_layer, lc); DEG_relations_tag_update(CTX_data_main(C)); WM_event_add_notifier(C, NC_SCENE | ND_LAYER, scene); } @@ -896,13 +896,13 @@ static Base *outline_delete_hierarchy(bContext *C, ReportList *reports, Scene *s { Base *child_base, *base_next; Object *parent; - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); if (!base) { return NULL; } - for (child_base = scene_layer->object_bases.first; child_base; child_base = base_next) { + for (child_base = view_layer->object_bases.first; child_base; child_base = base_next) { base_next = child_base->next; for (parent = child_base->object->parent; parent && (parent != base->object); parent = parent->parent); if (parent) { @@ -933,12 +933,12 @@ static void object_delete_hierarchy_cb( bContext *C, ReportList *reports, Scene *scene, TreeElement *te, TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void *UNUSED(user_data)) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Base *base = (Base *)te->directdata; Object *obedit = scene->obedit; if (!base) { - base = BKE_scene_layer_base_find(sl, (Object *)tselem->id); + base = BKE_view_layer_base_find(sl, (Object *)tselem->id); } if (base) { /* Check also library later. */ diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index eda4faab93f..1ab715d0246 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -234,7 +234,7 @@ static void outliner_add_bone(SpaceOops *soops, ListBase *lb, ID *id, Bone *curB #define LOG2I(x) (int)(log(x) / M_LN2) -static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, SceneLayer *scene_layer) +static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, ViewLayer *view_layer) { TreeStoreElem *tselem = NULL; TreeElement *te = NULL; @@ -244,7 +244,7 @@ static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, Sc te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_COMBINED)); te->name = IFACE_("Combined"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; /* save cpu cycles, but we add the first to invoke an open/close triangle */ tselem = TREESTORE(tenla); @@ -253,71 +253,71 @@ static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, Sc te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_Z)); te->name = IFACE_("Z"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_VECTOR)); te->name = IFACE_("Vector"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_NORMAL)); te->name = IFACE_("Normal"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_UV)); te->name = IFACE_("UV"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_MIST)); te->name = IFACE_("Mist"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_INDEXOB)); te->name = IFACE_("Index Object"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_INDEXMA)); te->name = IFACE_("Index Material"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_RGBA)); te->name = IFACE_("Color"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_DIFFUSE)); te->name = IFACE_("Diffuse"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_SPEC)); te->name = IFACE_("Specular"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_SHADOW)); te->name = IFACE_("Shadow"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_AO)); te->name = IFACE_("AO"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_REFLECT)); te->name = IFACE_("Reflection"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_REFRACT)); te->name = IFACE_("Refraction"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_INDIRECT)); te->name = IFACE_("Indirect"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_ENVIRONMENT)); te->name = IFACE_("Environment"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; te = outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_EMIT)); te->name = IFACE_("Emit"); - te->directdata = &scene_layer->passflag; + te->directdata = &view_layer->passflag; } #undef LOG2I @@ -332,19 +332,19 @@ static bool outliner_animdata_test(AnimData *adt) #ifdef WITH_FREESTYLE static void outliner_add_line_styles(SpaceOops *soops, ListBase *lb, Scene *sce, TreeElement *te) { - SceneLayer *scene_layer; + ViewLayer *view_layer; FreestyleLineSet *lineset; - for (scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - for (lineset = scene_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) { + for (view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) { + for (lineset = view_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) { FreestyleLineStyle *linestyle = lineset->linestyle; if (linestyle) { linestyle->id.tag |= LIB_TAG_DOIT; } } } - for (scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - for (lineset = scene_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) { + for (view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) { + for (lineset = view_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) { FreestyleLineStyle *linestyle = lineset->linestyle; if (linestyle) { if (!(linestyle->id.tag & LIB_TAG_DOIT)) @@ -359,16 +359,16 @@ static void outliner_add_line_styles(SpaceOops *soops, ListBase *lb, Scene *sce, static void outliner_add_scene_contents(SpaceOops *soops, ListBase *lb, Scene *sce, TreeElement *te) { - SceneLayer *scene_layer; + ViewLayer *view_layer; TreeElement *tenla = outliner_add_element(soops, lb, sce, te, TSE_R_LAYER_BASE, 0); int a; tenla->name = IFACE_("RenderLayers"); - for (a = 0, scene_layer = sce->render_layers.first; scene_layer; scene_layer = scene_layer->next, a++) { + for (a = 0, view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next, a++) { TreeElement *tenlay = outliner_add_element(soops, &tenla->subtree, sce, te, TSE_R_LAYER, a); - tenlay->name = scene_layer->name; - tenlay->directdata = &scene_layer->flag; - outliner_add_passes(soops, tenlay, &sce->id, scene_layer); + tenlay->name = view_layer->name; + tenlay->directdata = &view_layer->flag; + outliner_add_passes(soops, tenlay, &sce->id, view_layer); } // TODO: move this to the front? @@ -1398,7 +1398,7 @@ static void outliner_add_layer_collections_recursive( outliner_make_hierarchy(&ten->subtree); } } -static void outliner_add_collections_act_layer(SpaceOops *soops, SceneLayer *layer) +static void outliner_add_collections_act_layer(SpaceOops *soops, ViewLayer *layer) { outliner_add_layer_collections_recursive(soops, &soops->tree, &layer->layer_collections, NULL); } @@ -1729,7 +1729,7 @@ static int outliner_filter_tree(SpaceOops *soops, ListBase *lb) /* Main entry point for building the tree data-structure that the outliner represents */ // TODO: split each mode into its own function? -void outliner_build_tree(Main *mainvar, Scene *scene, SceneLayer *sl, SpaceOops *soops) +void outliner_build_tree(Main *mainvar, Scene *scene, ViewLayer *view_layer, SpaceOops *soops) { TreeElement *te = NULL, *ten; TreeStoreElem *tselem; @@ -1840,7 +1840,7 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SceneLayer *sl, SpaceOops outliner_make_hierarchy(&soops->tree); } else if (soops->outlinevis == SO_VISIBLE) { - FOREACH_VISIBLE_BASE(sl, base) + FOREACH_VISIBLE_BASE(view_layer, base) { ten = outliner_add_element(soops, &soops->tree, base->object, NULL, 0, 0); ten->directdata = base; @@ -1867,7 +1867,7 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SceneLayer *sl, SpaceOops } } else if (soops->outlinevis == SO_SAME_TYPE) { - Object *ob_active = OBACT(sl); + Object *ob_active = OBACT(view_layer); if (ob_active) { FOREACH_SCENE_OBJECT(scene, ob) { @@ -1880,7 +1880,7 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SceneLayer *sl, SpaceOops } } else if (soops->outlinevis == SO_SELECTED) { - FOREACH_SELECTED_BASE(sl, base) + FOREACH_SELECTED_BASE(view_layer, base) { ten = outliner_add_element(soops, &soops->tree, base->object, NULL, 0, 0); ten->directdata = base; @@ -1940,14 +1940,14 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SceneLayer *sl, SpaceOops outliner_add_orphaned_datablocks(mainvar, soops); } else if (soops->outlinevis == SO_ACT_LAYER) { - outliner_add_collections_act_layer(soops, sl); + outliner_add_collections_act_layer(soops, view_layer); } else if (soops->outlinevis == SO_COLLECTIONS) { outliner_add_collections_master(soops, scene); } else { - ten = outliner_add_element(soops, &soops->tree, OBACT(sl), NULL, 0, 0); - ten->directdata = BASACT(sl); + ten = outliner_add_element(soops, &soops->tree, OBACT(view_layer), NULL, 0, 0); + ten->directdata = BASACT(view_layer); } if ((soops->flag & SO_SKIP_SORT_ALPHA) == 0) { diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c index 229d999eb9e..ffaa259ab6f 100644 --- a/source/blender/editors/space_outliner/space_outliner.c +++ b/source/blender/editors/space_outliner/space_outliner.c @@ -126,11 +126,11 @@ static int outliner_parent_drop_poll(bContext *C, wmDrag *drag, const wmEvent *e if (!scene) { return 1; } else { - for (SceneLayer *scene_layer = scene->render_layers.first; - scene_layer; - scene_layer = scene_layer->next) + for (ViewLayer *view_layer = scene->view_layers.first; + view_layer; + view_layer = view_layer->next) { - if (BKE_scene_layer_base_find(scene_layer, (Object *)id)) { + if (BKE_view_layer_base_find(view_layer, (Object *)id)) { return 1; } } diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c index b9a35de6779..2fbaffc5055 100644 --- a/source/blender/editors/space_time/space_time.c +++ b/source/blender/editors/space_time/space_time.c @@ -346,7 +346,7 @@ static void time_draw_idblock_keyframes(View2D *v2d, ID *id, short onlysel, cons BLI_dlrbTree_free(&keys); } -static void time_draw_caches_keyframes(Main *bmain, SceneLayer *sl, View2D *v2d, bool onlysel, const unsigned char color[3]) +static void time_draw_caches_keyframes(Main *bmain, ViewLayer *sl, View2D *v2d, bool onlysel, const unsigned char color[3]) { CacheFile *cache_file; @@ -400,7 +400,7 @@ static void time_draw_caches_keyframes(Main *bmain, SceneLayer *sl, View2D *v2d, static void time_draw_keyframes(const bContext *C, ARegion *ar) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = CTX_data_active_object(C); View2D *v2d = &ar->v2d; bool onlysel = ((scene->flag & SCE_KEYS_NO_SELONLY) == 0); diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index f04b8c0cdad..70295e17c9c 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -1612,7 +1612,7 @@ static void draw_bone(const short dt, int armflag, int boneflag, short constflag static void draw_custom_bone( const struct EvaluationContext *eval_ctx, - Scene *scene, SceneLayer *sl, View3D *v3d, RegionView3D *rv3d, Object *ob, + Scene *scene, ViewLayer *sl, View3D *v3d, RegionView3D *rv3d, Object *ob, const short dt, int armflag, int boneflag, unsigned int id, float length) { if (ob == NULL) return; @@ -1933,7 +1933,7 @@ static void bone_matrix_translate_y(float mat[4][4], float y) /* assumes object is Armature with pose */ static void draw_pose_bones( - const struct EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, View3D *v3d, ARegion *ar, Base *base, + const struct EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, View3D *v3d, ARegion *ar, Base *base, const short dt, const unsigned char ob_wire_col[4], const bool do_const_color, const bool is_outline) { @@ -2667,7 +2667,7 @@ static void ghost_poses_tag_unselected(Object *ob, short unset) * note: object should be in posemode */ static void draw_ghost_poses_range( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, View3D *v3d, ARegion *ar, Base *base) + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, View3D *v3d, ARegion *ar, Base *base) { Object *ob = base->object; AnimData *adt = BKE_animdata_from_id(&ob->id); @@ -2735,7 +2735,7 @@ static void draw_ghost_poses_range( * - object should be in posemode */ static void draw_ghost_poses_keys( - const struct EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, + const struct EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, View3D *v3d, ARegion *ar, Base *base) { Object *ob = base->object; @@ -2819,7 +2819,7 @@ static void draw_ghost_poses_keys( * - object is supposed to be armature in posemode */ static void draw_ghost_poses( - const struct EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, + const struct EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, View3D *v3d, ARegion *ar, Base *base) { Object *ob = base->object; @@ -2916,7 +2916,7 @@ static void draw_ghost_poses( /* called from drawobject.c, return true if nothing was drawn * (ob_wire_col == NULL) when drawing ghost */ bool draw_armature( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, View3D *v3d, ARegion *ar, Base *base, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, View3D *v3d, ARegion *ar, Base *base, const short dt, const short dflag, const unsigned char ob_wire_col[4], const bool is_outline) { diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 719fb6f764f..5d336400d3f 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -220,7 +220,7 @@ typedef struct TexMatCallback { bool two_sided_lighting; } TexMatCallback; -void draw_mesh_textured(Scene *scene, SceneLayer *sl, View3D *v3d, RegionView3D *rv3d, +void draw_mesh_textured(Scene *scene, ViewLayer *sl, View3D *v3d, RegionView3D *rv3d, Object *ob, DerivedMesh *dm, const int draw_flags) { UNUSED_VARS(scene, sl, v3d, rv3d, ob, dm, draw_flags); diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index eaf699d8385..3b82076c630 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -314,7 +314,7 @@ static bool check_ob_drawface_dot(Scene *sce, View3D *vd, char dt) /* check for glsl drawing */ -bool draw_glsl_material(Scene *scene, SceneLayer *sl, Object *ob, View3D *v3d, const char dt) +bool draw_glsl_material(Scene *scene, ViewLayer *sl, Object *ob, View3D *v3d, const char dt) { if (G.f & G_PICKSEL) return false; @@ -3894,7 +3894,7 @@ static DMDrawOption draw_em_fancy__setGLSLFaceOpts(void *userData, int index) } } -static void draw_em_fancy(Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d, +static void draw_em_fancy(Scene *scene, ViewLayer *sl, ARegion *ar, View3D *v3d, Object *ob, BMEditMesh *em, DerivedMesh *cageDM, DerivedMesh *finalDM, const char dt) { @@ -4300,7 +4300,7 @@ static bool object_is_halo(Scene *scene, Object *ob) } static void draw_mesh_fancy( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base, const char dt, const unsigned char ob_wire_col[4], const short dflag) { #ifdef WITH_GAMEENGINE @@ -4565,7 +4565,7 @@ static void draw_mesh_fancy( /* returns true if nothing was drawn, for detecting to draw an object center */ static bool draw_mesh_object( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base, const char dt, const unsigned char ob_wire_col[4], const short dflag) { Object *ob = base->object; @@ -4709,7 +4709,7 @@ static void make_color_variations(const unsigned char base_ubyte[4], float low[4 high[3] = base[3]; } -static void draw_mesh_fancy_new(EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base, +static void draw_mesh_fancy_new(EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base, const char dt, const unsigned char ob_wire_col[4], const short dflag, const bool other_obedit) { if (dflag & (DRAW_PICKING | DRAW_CONSTCOLOR)) { @@ -5027,7 +5027,7 @@ static void draw_mesh_fancy_new(EvaluationContext *eval_ctx, Scene *scene, Scene dm->release(dm); } -static bool UNUSED_FUNCTION(draw_mesh_object_new)(const bContext *C, Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base, +static bool UNUSED_FUNCTION(draw_mesh_object_new)(const bContext *C, Scene *scene, ViewLayer *sl, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base, const char dt, const unsigned char ob_wire_col[4], const short dflag) { EvaluationContext eval_ctx; @@ -5427,7 +5427,7 @@ static void drawCurveDMWired(Object *ob) } /* return true when nothing was drawn */ -static bool drawCurveDerivedMesh(Scene *scene, SceneLayer *sl, View3D *v3d, RegionView3D *rv3d, Base *base, const char dt) +static bool drawCurveDerivedMesh(Scene *scene, ViewLayer *sl, View3D *v3d, RegionView3D *rv3d, Base *base, const char dt) { Object *ob = base->object; DerivedMesh *dm = ob->derivedFinal; @@ -5463,7 +5463,7 @@ static bool drawCurveDerivedMesh(Scene *scene, SceneLayer *sl, View3D *v3d, Regi * Only called by #drawDispList * \return true when nothing was drawn */ -static bool drawDispList_nobackface(Scene *scene, SceneLayer *sl, View3D *v3d, RegionView3D *rv3d, Base *base, +static bool drawDispList_nobackface(Scene *scene, ViewLayer *sl, View3D *v3d, RegionView3D *rv3d, Base *base, const char dt, const short dflag, const unsigned char ob_wire_col[4]) { Object *ob = base->object; @@ -5585,7 +5585,7 @@ static bool drawDispList_nobackface(Scene *scene, SceneLayer *sl, View3D *v3d, R return false; } static bool drawDispList( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, View3D *v3d, RegionView3D *rv3d, Base *base, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, View3D *v3d, RegionView3D *rv3d, Base *base, const char dt, const short dflag, const unsigned char ob_wire_col[4]) { bool retval; @@ -5941,7 +5941,7 @@ static void draw_new_particle_system( if (pars == NULL) return; /* don't draw normal paths in edit mode */ - if (psys_in_edit_mode(eval_ctx->scene_layer, psys) && (pset->flag & PE_DRAW_PART) == 0) + if (psys_in_edit_mode(eval_ctx->view_layer, psys) && (pset->flag & PE_DRAW_PART) == 0) return; if (part->draw_as == PART_DRAW_REND) @@ -6595,7 +6595,7 @@ static void draw_new_particle_system( } static void draw_update_ptcache_edit( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, Object *ob, PTCacheEdit *edit) + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, Object *ob, PTCacheEdit *edit) { if (edit->psys && edit->psys->flag & PSYS_HAIR_UPDATED) PE_update_object(eval_ctx, scene, sl, ob, 0); @@ -7337,7 +7337,7 @@ static void draw_editnurb_splines(Object *ob, Nurb *nurb, const bool sel) } static void draw_editnurb( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, View3D *v3d, RegionView3D *rv3d, Base *base, Nurb *nurb, const char dt, const short dflag, const unsigned char UNUSED(ob_wire_col[4])) { @@ -7478,7 +7478,7 @@ static void draw_editfont_textcurs(RegionView3D *rv3d, float textcurs[4][2]) } static void draw_editfont( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, View3D *v3d, RegionView3D *rv3d, Base *base, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, View3D *v3d, RegionView3D *rv3d, Base *base, const char dt, const short dflag, const unsigned char ob_wire_col[4]) { Object *ob = base->object; @@ -7798,7 +7798,7 @@ static void imm_drawcone(const float vec[3], float radius, float height, float t /* return true if nothing was drawn */ static bool drawmball( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, View3D *v3d, RegionView3D *rv3d, Base *base, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, View3D *v3d, RegionView3D *rv3d, Base *base, const char dt, const short dflag, const unsigned char ob_wire_col[4]) { Object *ob = base->object; @@ -8266,7 +8266,7 @@ static void drawtexspace(Object *ob, const unsigned char ob_wire_col[3]) /* draws wire outline */ static void draw_object_selected_outline( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, View3D *v3d, ARegion *ar, Base *base, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, View3D *v3d, ARegion *ar, Base *base, const unsigned char ob_wire_col[4]) { RegionView3D *rv3d = ar->regiondata; @@ -8423,7 +8423,7 @@ static void draw_rigid_body_pivot(bRigidBodyJointConstraint *data, immUnbindProgram(); } -void draw_object_wire_color(Scene *scene, SceneLayer *sl, Base *base, unsigned char r_ob_wire_col[4]) +void draw_object_wire_color(Scene *scene, ViewLayer *sl, Base *base, unsigned char r_ob_wire_col[4]) { Object *ob = base->object; int colindex = 0; @@ -8568,7 +8568,7 @@ void draw_rigidbody_shape(Object *ob, const unsigned char ob_wire_col[4]) * \param dflag (draw flag) can be DRAW_PICKING and/or DRAW_CONSTCOLOR, DRAW_SCENESET */ void draw_object( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, ARegion *ar, View3D *v3d, Base *base, const short dflag) { ModifierData *md = NULL; @@ -9331,7 +9331,7 @@ afterdraw: * caller must have called 'GPU_select_load_id(base->selcode)' first. */ void draw_object_select( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, ARegion *ar, View3D *v3d, Base *base, const short dflag) { BLI_assert(dflag & DRAW_PICKING && dflag & DRAW_CONSTCOLOR); @@ -9816,7 +9816,7 @@ void draw_object_backbufsel( /* helper function for drawing object instances - meshes */ static void draw_object_mesh_instance( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, View3D *v3d, RegionView3D *rv3d, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, View3D *v3d, RegionView3D *rv3d, Object *ob, const short dt, int outline, const unsigned char ob_wire_col[4]) { Mesh *me = ob->data; @@ -9863,7 +9863,7 @@ static void draw_object_mesh_instance( if (dm) dm->release(dm); } -void draw_object_instance(const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, View3D *v3d, RegionView3D *rv3d, Object *ob, const char dt, int outline, const float wire_col[4]) +void draw_object_instance(const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, View3D *v3d, RegionView3D *rv3d, Object *ob, const char dt, int outline, const float wire_col[4]) { if (ob == NULL) return; diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index e1e78fd8ff1..e6e41e53ce3 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -1323,7 +1323,7 @@ static int view3d_context(const bContext *C, const char *member, bContextDataRes } else if (CTX_data_equals(member, "active_base")) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); if (sl->basact) { Object *ob = sl->basact->object; /* if hidden but in edit mode, we still display, can happen with animation */ @@ -1335,7 +1335,7 @@ static int view3d_context(const bContext *C, const char *member, bContextDataRes return 1; } else if (CTX_data_equals(member, "active_object")) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); if (sl->basact) { Object *ob = sl->basact->object; /* if hidden but in edit mode, we still display, can happen with animation */ diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index ac808487dd2..c72bcfa3794 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -777,7 +777,7 @@ static void do_view3d_vgroup_buttons(bContext *C, void *UNUSED(arg), int event) return; } else { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = sl->basact->object; ED_vgroup_vert_active_mirror(ob, event - B_VGRP_PNL_EDIT_SINGLE); DEG_id_tag_update(&ob->id, OB_RECALC_DATA); @@ -787,7 +787,7 @@ static void do_view3d_vgroup_buttons(bContext *C, void *UNUSED(arg), int event) static int view3d_panel_vgroup_poll(const bContext *C, PanelType *UNUSED(pt)) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = OBACT(sl); if (ob && (BKE_object_is_in_editmode_vgroup(ob) || BKE_object_is_in_wpaint_select_vert(ob))) @@ -806,7 +806,7 @@ static void view3d_panel_vgroup(const bContext *C, Panel *pa) { uiBlock *block = uiLayoutAbsoluteBlock(pa->layout); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = sl->basact->object; MDeformVert *dv; @@ -1097,7 +1097,7 @@ static void v3d_editmetaball_buts(uiLayout *layout, Object *ob) static void do_view3d_region_buttons(bContext *C, void *UNUSED(index), int event) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); View3D *v3d = CTX_wm_view3d(C); Object *ob = OBACT(sl); @@ -1121,7 +1121,7 @@ static void do_view3d_region_buttons(bContext *C, void *UNUSED(index), int event static int view3d_panel_transform_poll(const bContext *C, PanelType *UNUSED(pt)) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); return (sl->basact != NULL); } @@ -1129,7 +1129,7 @@ static void view3d_panel_transform(const bContext *C, Panel *pa) { uiBlock *block; Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *obedit = CTX_data_edit_object(C); Object *ob = sl->basact->object; uiLayout *col; diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 475e9cd07bf..ac96218b176 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1314,7 +1314,7 @@ float ED_view3d_grid_scale(Scene *scene, View3D *v3d, const char **grid_unit) return v3d->grid * ED_scene_grid_scale(scene, grid_unit); } -static bool is_cursor_visible(Scene *scene, SceneLayer *sl) +static bool is_cursor_visible(Scene *scene, ViewLayer *sl) { Object *ob = OBACT(sl); @@ -1846,7 +1846,7 @@ void view3d_draw_region_info(const bContext *C, ARegion *ar, const int offset) } if (U.uiflag & USER_DRAWVIEWINFO) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = OBACT(sl); draw_selected_name(scene, ob, &rect); } @@ -1930,7 +1930,7 @@ static void view3d_stereo3d_setup_offscreen( } } -void ED_view3d_draw_offscreen_init(const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, View3D *v3d) +void ED_view3d_draw_offscreen_init(const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, View3D *v3d) { RenderEngineType *type = eval_ctx->engine; if (type->flag & RE_USE_LEGACY_PIPELINE) { @@ -1960,7 +1960,7 @@ static void view3d_main_region_clear(Scene *scene, View3D *v3d, ARegion *ar) * stuff like shadow buffers */ void ED_view3d_draw_offscreen( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *scene_layer, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *view_layer, View3D *v3d, ARegion *ar, int winx, int winy, float viewmat[4][4], float winmat[4][4], bool do_bgpic, bool do_sky, bool is_persp, const char *viewname, @@ -2048,7 +2048,7 @@ void ED_view3d_draw_offscreen( if (v3d->flag2 & V3D_SHOW_GPENCIL) { /* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */ - ED_gpencil_draw_view3d(NULL, scene, scene_layer, v3d, ar, false); + ED_gpencil_draw_view3d(NULL, scene, view_layer, v3d, ar, false); } /* freeing the images again here could be done after the operator runs, leaving for now */ @@ -2057,7 +2057,7 @@ void ED_view3d_draw_offscreen( } else { /* XXX, should take depsgraph as arg */ - Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, scene_layer, false); + Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, false); BLI_assert(depsgraph != NULL); DRW_draw_render_loop_offscreen(depsgraph, eval_ctx->engine, ar, v3d, ofs); } @@ -2082,7 +2082,7 @@ void ED_view3d_draw_offscreen( * (avoids re-creating when doing multiple GL renders). */ ImBuf *ED_view3d_draw_offscreen_imbuf( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *scene_layer, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *view_layer, View3D *v3d, ARegion *ar, int sizex, int sizey, unsigned int flag, bool draw_background, int alpha_mode, int samples, bool full_samples, const char *viewname, @@ -2112,7 +2112,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf( } } - ED_view3d_draw_offscreen_init(eval_ctx, scene, scene_layer, v3d); + ED_view3d_draw_offscreen_init(eval_ctx, scene, view_layer, v3d); GPU_offscreen_bind(ofs, true); @@ -2154,7 +2154,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf( if ((samples && full_samples) == 0) { /* Single-pass render, common case */ ED_view3d_draw_offscreen( - eval_ctx, scene, scene_layer, v3d, ar, sizex, sizey, NULL, winmat, + eval_ctx, scene, view_layer, v3d, ar, sizex, sizey, NULL, winmat, draw_background, draw_sky, !is_ortho, viewname, fx, &fx_settings, ofs); @@ -2178,7 +2178,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf( /* first sample buffer, also initializes 'rv3d->persmat' */ ED_view3d_draw_offscreen( - eval_ctx, scene, scene_layer, v3d, ar, sizex, sizey, NULL, winmat, + eval_ctx, scene, view_layer, v3d, ar, sizex, sizey, NULL, winmat, draw_background, draw_sky, !is_ortho, viewname, fx, &fx_settings, ofs); GPU_offscreen_read_pixels(ofs, GL_UNSIGNED_BYTE, rect_temp); @@ -2197,7 +2197,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf( (jit_ofs[j][1] * 2.0f) / sizey); ED_view3d_draw_offscreen( - eval_ctx, scene, scene_layer, v3d, ar, sizex, sizey, NULL, winmat_jitter, + eval_ctx, scene, view_layer, v3d, ar, sizex, sizey, NULL, winmat_jitter, draw_background, draw_sky, !is_ortho, viewname, fx, &fx_settings, ofs); GPU_offscreen_read_pixels(ofs, GL_UNSIGNED_BYTE, rect_temp); @@ -2248,7 +2248,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf( * \note used by the sequencer */ ImBuf *ED_view3d_draw_offscreen_imbuf_simple( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *scene_layer, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *view_layer, Object *camera, int width, int height, unsigned int flag, int drawtype, bool use_solid_tex, bool use_gpencil, bool draw_background, int alpha_mode, int samples, bool full_samples, const char *viewname, @@ -2303,7 +2303,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple( invert_m4_m4(rv3d.persinv, rv3d.viewinv); return ED_view3d_draw_offscreen_imbuf( - eval_ctx, scene, scene_layer, &v3d, &ar, width, height, flag, + eval_ctx, scene, view_layer, &v3d, &ar, width, height, flag, draw_background, alpha_mode, samples, full_samples, viewname, fx, ofs, err_out); } @@ -2320,7 +2320,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple( * * \{ */ -void VP_legacy_drawcursor(Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d) +void VP_legacy_drawcursor(Scene *scene, ViewLayer *sl, ARegion *ar, View3D *v3d) { if (is_cursor_visible(scene, sl)) { drawcursor(scene, ar, v3d); diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c index 9f1c27a09e7..e3811d28d0d 100644 --- a/source/blender/editors/space_view3d/view3d_draw_legacy.c +++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c @@ -211,7 +211,7 @@ static void draw_view_icon(RegionView3D *rv3d, rcti *rect) /* *********************** backdraw for selection *************** */ -static void backdrawview3d(const struct EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, wmWindow *win, ARegion *ar, View3D *v3d) +static void backdrawview3d(const struct EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, wmWindow *win, ARegion *ar, View3D *v3d) { RegionView3D *rv3d = ar->regiondata; struct Base *base = sl->basact; @@ -356,7 +356,7 @@ static void view3d_opengl_read_Z_pixels(ARegion *ar, int x, int y, int w, int h, void ED_view3d_backbuf_validate(const struct EvaluationContext *eval_ctx, ViewContext *vc) { if (vc->v3d->flag & V3D_INVALID_BACKBUF) { - backdrawview3d(eval_ctx, vc->scene, vc->scene_layer, vc->win, vc->ar, vc->v3d); + backdrawview3d(eval_ctx, vc->scene, vc->view_layer, vc->win, vc->ar, vc->v3d); } } @@ -825,7 +825,7 @@ void ED_view3d_after_add(ListBase *lb, Base *base, const short dflag) /* disables write in zbuffer and draws it over */ static void view3d_draw_transp( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d) + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, ARegion *ar, View3D *v3d) { View3DAfter *v3da; @@ -844,7 +844,7 @@ static void view3d_draw_transp( /* clears zbuffer and draws it over */ static void view3d_draw_xray( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d, bool *clear) + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, ARegion *ar, View3D *v3d, bool *clear) { if (*clear && v3d->zbuf) { glClear(GL_DEPTH_BUFFER_BIT); @@ -863,7 +863,7 @@ static void view3d_draw_xray( /* clears zbuffer and draws it over */ static void view3d_draw_xraytransp( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d, const bool clear) + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, ARegion *ar, View3D *v3d, const bool clear) { if (clear && v3d->zbuf) glClear(GL_DEPTH_BUFFER_BIT); @@ -888,7 +888,7 @@ static void view3d_draw_xraytransp( /* clears zbuffer and draws it over, * note that in the select version we don't care about transparent flag as with regular drawing */ static void view3d_draw_xray_select( - const struct EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d, bool *clear) + const struct EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, ARegion *ar, View3D *v3d, bool *clear) { /* Not ideal, but we need to read from the previous depths before clearing * otherwise we could have a function to load the depths after drawing. @@ -944,7 +944,7 @@ static DupliObject *dupli_step(DupliObject *dob) } static void draw_dupli_objects_color( - const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d, Base *base, + const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, ARegion *ar, View3D *v3d, Base *base, const short dflag, const int color) { RegionView3D *rv3d = ar->regiondata; @@ -1045,7 +1045,7 @@ static void draw_dupli_objects_color( free_object_duplilist(lb); } -void draw_dupli_objects(const EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d, Base *base) +void draw_dupli_objects(const EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, ARegion *ar, View3D *v3d, Base *base) { /* define the color here so draw_dupli_objects_color can be called * from the set loop */ @@ -1182,7 +1182,7 @@ void ED_view3d_draw_depth_gpencil( glEnable(GL_DEPTH_TEST); if (v3d->flag2 & V3D_SHOW_GPENCIL) { - ED_gpencil_draw_view3d(NULL, scene, eval_ctx->scene_layer, v3d, ar, true); + ED_gpencil_draw_view3d(NULL, scene, eval_ctx->view_layer, v3d, ar, true); } v3d->zbuf = zbuf; @@ -1192,7 +1192,7 @@ void ED_view3d_draw_depth_gpencil( void ED_view3d_draw_depth_loop(const EvaluationContext *eval_ctx, Scene *scene, ARegion *ar, View3D *v3d) { Base *base; - SceneLayer *sl = eval_ctx->scene_layer; + ViewLayer *sl = eval_ctx->view_layer; /* no need for color when drawing depth buffer */ const short dflag_depth = DRAW_CONSTCOLOR; @@ -1272,7 +1272,7 @@ void ED_view3d_draw_depth_loop(const EvaluationContext *eval_ctx, Scene *scene, } void ED_view3d_draw_select_loop( - const struct EvaluationContext *eval_ctx, ViewContext *vc, Scene *scene, SceneLayer *sl, + const struct EvaluationContext *eval_ctx, ViewContext *vc, Scene *scene, ViewLayer *sl, View3D *v3d, ARegion *ar, bool use_obedit_skip, bool use_nearest) { struct bThemeState theme_state; @@ -1421,7 +1421,7 @@ static void gpu_update_lamps_shadows_world(const EvaluationContext *eval_ctx, Sc /* no need to call ED_view3d_draw_offscreen_init since shadow buffers were already updated */ ED_view3d_draw_offscreen( - eval_ctx, scene, eval_ctx->scene_layer, v3d, &ar, winsize, winsize, viewmat, winmat, + eval_ctx, scene, eval_ctx->view_layer, v3d, &ar, winsize, winsize, viewmat, winmat, false, false, true, NULL, NULL, NULL, NULL); GPU_lamp_shadow_buffer_unbind(shadow->lamp); @@ -1499,7 +1499,7 @@ static void view3d_draw_objects( const char **grid_unit, const bool do_bgpic, const bool draw_offscreen, GPUFX *fx) { - SceneLayer *scene_layer = C ? CTX_data_scene_layer(C) : BKE_scene_layer_from_scene_get(scene); + ViewLayer *view_layer = C ? CTX_data_view_layer(C) : BKE_view_layer_from_scene_get(scene); RegionView3D *rv3d = ar->regiondata; Base *base; const bool do_camera_frame = !draw_offscreen; @@ -1558,10 +1558,10 @@ static void view3d_draw_objects( for (SETLOOPER(scene->set, sce_iter, base)) { if ((base->flag & BASE_VISIBLED) != 0) { UI_ThemeColorBlend(TH_WIRE, TH_BACK, 0.6f); - draw_object(eval_ctx, scene, scene_layer, ar, v3d, base, dflag); + draw_object(eval_ctx, scene, view_layer, ar, v3d, base, dflag); if (base->object->transflag & OB_DUPLI) { - draw_dupli_objects_color(eval_ctx, scene, scene_layer, ar, v3d, base, dflag, TH_UNDEFINED); + draw_dupli_objects_color(eval_ctx, scene, view_layer, ar, v3d, base, dflag, TH_UNDEFINED); } } } @@ -1570,14 +1570,14 @@ static void view3d_draw_objects( } if (draw_offscreen) { - for (base = scene_layer->object_bases.first; base; base = base->next) { + for (base = view_layer->object_bases.first; base; base = base->next) { if ((base->flag & BASE_VISIBLED) != 0) { /* dupli drawing */ if (base->object->transflag & OB_DUPLI) { - draw_dupli_objects(eval_ctx, scene, scene_layer, ar, v3d, base); + draw_dupli_objects(eval_ctx, scene, view_layer, ar, v3d, base); } - draw_object(eval_ctx, scene, scene_layer, ar, v3d, base, 0); + draw_object(eval_ctx, scene, view_layer, ar, v3d, base, 0); } } } @@ -1585,18 +1585,18 @@ static void view3d_draw_objects( unsigned int lay_used = 0; /* then draw not selected and the duplis, but skip editmode object */ - for (base = scene_layer->object_bases.first; base; base = base->next) { + for (base = view_layer->object_bases.first; base; base = base->next) { lay_used |= base->lay; if ((base->flag & BASE_VISIBLED) != 0) { /* dupli drawing */ if (base->object->transflag & OB_DUPLI) { - draw_dupli_objects(eval_ctx, scene, scene_layer, ar, v3d, base); + draw_dupli_objects(eval_ctx, scene, view_layer, ar, v3d, base); } if ((base->flag & BASE_SELECTED) == 0) { if (base->object != scene->obedit) - draw_object(eval_ctx, scene, scene_layer, ar, v3d, base, 0); + draw_object(eval_ctx, scene, view_layer, ar, v3d, base, 0); } } } @@ -1605,10 +1605,10 @@ static void view3d_draw_objects( v3d->lay_used = lay_used & ((1 << 20) - 1); /* draw selected and editmode */ - for (base = scene_layer->object_bases.first; base; base = base->next) { + for (base = view_layer->object_bases.first; base; base = base->next) { if ((base->flag & BASE_VISIBLED) != 0) { if (base->object == scene->obedit || (base->flag & BASE_SELECTED)) { - draw_object(eval_ctx, scene, scene_layer, ar, v3d, base, 0); + draw_object(eval_ctx, scene, view_layer, ar, v3d, base, 0); } } } @@ -1625,12 +1625,12 @@ static void view3d_draw_objects( /* must be before xray draw which clears the depth buffer */ if (v3d->zbuf) glDisable(GL_DEPTH_TEST); - ED_gpencil_draw_view3d(wm, scene, scene_layer, v3d, ar, true); + ED_gpencil_draw_view3d(wm, scene, view_layer, v3d, ar, true); if (v3d->zbuf) glEnable(GL_DEPTH_TEST); } /* transp and X-ray afterdraw stuff */ - if (v3d->afterdraw_transp.first) view3d_draw_transp(eval_ctx, scene, scene_layer, ar, v3d); + if (v3d->afterdraw_transp.first) view3d_draw_transp(eval_ctx, scene, view_layer, ar, v3d); /* always do that here to cleanup depth buffers if none needed */ if (fx) { @@ -1638,8 +1638,8 @@ static void view3d_draw_objects( GPU_fx_compositor_setup_XRay_pass(fx, do_composite_xray); } - if (v3d->afterdraw_xray.first) view3d_draw_xray(eval_ctx, scene, scene_layer, ar, v3d, &xrayclear); - if (v3d->afterdraw_xraytransp.first) view3d_draw_xraytransp(eval_ctx, scene, scene_layer, ar, v3d, xrayclear); + if (v3d->afterdraw_xray.first) view3d_draw_xray(eval_ctx, scene, view_layer, ar, v3d, &xrayclear); + if (v3d->afterdraw_xraytransp.first) view3d_draw_xraytransp(eval_ctx, scene, view_layer, ar, v3d, xrayclear); if (fx && do_composite_xray) { GPU_fx_compositor_XRay_resolve(fx); @@ -1942,7 +1942,7 @@ static void update_lods(Scene *scene, float camera_pos[3]) } #endif -static void view3d_main_region_draw_objects(const bContext *C, Scene *scene, SceneLayer *sl, View3D *v3d, +static void view3d_main_region_draw_objects(const bContext *C, Scene *scene, ViewLayer *sl, View3D *v3d, ARegion *ar, const char **grid_unit) { wmWindow *win = CTX_wm_window(C); @@ -2038,7 +2038,7 @@ static void view3d_main_region_draw_info(const bContext *C, Scene *scene, ARegion *ar, View3D *v3d, const char *grid_unit, bool render_border) { - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); wmWindowManager *wm = CTX_wm_manager(C); RegionView3D *rv3d = ar->regiondata; rcti rect; @@ -2055,11 +2055,11 @@ static void view3d_main_region_draw_info(const bContext *C, Scene *scene, if (v3d->flag2 & V3D_SHOW_GPENCIL) { /* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */ - ED_gpencil_draw_view3d(wm, scene, scene_layer, v3d, ar, false); + ED_gpencil_draw_view3d(wm, scene, view_layer, v3d, ar, false); } if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) { - VP_legacy_drawcursor(scene, scene_layer, ar, v3d); /* 3D cursor */ + VP_legacy_drawcursor(scene, view_layer, ar, v3d); /* 3D cursor */ if (U.uiflag & USER_SHOW_ROTVIEWICON) VP_legacy_draw_view_axis(rv3d, &rect); @@ -2067,7 +2067,7 @@ static void view3d_main_region_draw_info(const bContext *C, Scene *scene, draw_view_icon(rv3d, &rect); if (U.uiflag & USER_DRAWVIEWINFO) { - Object *ob = OBACT(scene_layer); + Object *ob = OBACT(view_layer); VP_legacy_draw_selected_name(scene, ob, &rect); } } @@ -2104,7 +2104,7 @@ void view3d_main_region_draw_legacy(const bContext *C, ARegion *ar) { EvaluationContext eval_ctx; Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); View3D *v3d = CTX_wm_view3d(C); const char *grid_unit = NULL; rcti border_rect; diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index dc6d6382d37..d768f47f81c 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -624,7 +624,7 @@ static bool view3d_orbit_calc_center(bContext *C, float r_dyn_ofs[3]) bool is_set = false; Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob_act = OBACT(sl); if (ob_act && (ob_act->mode & OB_MODE_ALL_PAINT) && @@ -2990,7 +2990,7 @@ static int view3d_all_exec(bContext *C, wmOperator *op) /* was view3d_home() in ARegion *ar = CTX_wm_region(C); View3D *v3d = CTX_wm_view3d(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Base *base; float *curs; const bool use_all_regions = RNA_boolean_get(op->ptr, "use_all_regions"); @@ -3075,12 +3075,12 @@ static int viewselected_exec(bContext *C, wmOperator *op) ARegion *ar = CTX_wm_region(C); View3D *v3d = CTX_wm_view3d(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); bGPdata *gpd = CTX_data_gpencil_data(C); const bool is_gp_edit = ((gpd) && (gpd->flag & GP_DATA_STROKE_EDITMODE)); const bool is_face_map = ((is_gp_edit == false) && ar->manipulator_map && WM_manipulatormap_is_any_selected(ar->manipulator_map)); - Object *ob = OBACT(sl); + Object *ob = OBACT(view_layer); Object *obedit = CTX_data_edit_object(C); float min[3], max[3]; bool ok = false, ok_dist = true; @@ -3099,7 +3099,7 @@ static int viewselected_exec(bContext *C, wmOperator *op) /* hard-coded exception, we look for the one selected armature */ /* this is weak code this way, we should make a generic active/selection callback interface once... */ Base *base; - for (base = sl->object_bases.first; base; base = base->next) { + for (base = view_layer->object_bases.first; base; base = base->next) { if (TESTBASELIB(base)) { if (base->object->type == OB_ARMATURE) if (base->object->mode & OB_MODE_POSE) @@ -3136,7 +3136,7 @@ static int viewselected_exec(bContext *C, wmOperator *op) ok = paintface_minmax(ob, min, max); } else if (ob && (ob->mode & OB_MODE_PARTICLE_EDIT)) { - ok = PE_minmax(scene, sl, min, max); + ok = PE_minmax(scene, view_layer, min, max); } else if (ob && (ob->mode & (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT))) @@ -3148,7 +3148,7 @@ static int viewselected_exec(bContext *C, wmOperator *op) } else { Base *base; - for (base = FIRSTBASE(sl); base; base = base->next) { + for (base = FIRSTBASE(view_layer); base; base = base->next) { if (TESTBASE(base)) { if (skip_camera && base->object == v3d->camera) { @@ -3915,7 +3915,7 @@ static int viewnumpad_exec(bContext *C, wmOperator *op) ARegion *ar; RegionView3D *rv3d; Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); static int perspo = RV3D_PERSP; int viewnum, nextperspo; bool align_active; @@ -3950,7 +3950,7 @@ static int viewnumpad_exec(bContext *C, wmOperator *op) /* lastview - */ if (rv3d->persp != RV3D_CAMOB) { - Object *ob = OBACT(scene_layer); + Object *ob = OBACT(view_layer); if (!rv3d->smooth_timer) { /* store settings of current view before allowing overwriting with camera view @@ -3985,7 +3985,7 @@ static int viewnumpad_exec(bContext *C, wmOperator *op) v3d->camera = ob; if (v3d->camera == NULL) - v3d->camera = BKE_scene_layer_camera_find(scene_layer); + v3d->camera = BKE_view_layer_camera_find(view_layer); /* couldnt find any useful camera, bail out */ if (v3d->camera == NULL) diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 4f322b8519d..33c19e50fc9 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -93,7 +93,7 @@ static void handle_view3d_lock(bContext *C) * layer code is on three levels actually: * - here for operator * - uiTemplateLayers in interface/ code for buttons - * - ED_view3d_scene_layer_set for RNA + * - ED_view3d_view_layer_set for RNA */ static void view3d_layers_editmode_ensure(Scene *scene, View3D *v3d) { @@ -280,7 +280,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) ScrArea *sa = CTX_wm_area(C); View3D *v3d = sa->spacedata.first; Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); ToolSettings *ts = CTX_data_tool_settings(C); PointerRNA v3dptr, toolsptr, sceneptr; Object *ob = OBACT(sl); diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index 189e22a04d7..8f79e105d9f 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -48,7 +48,7 @@ struct bContext; struct bMotionPath; struct bPoseChannel; struct Mesh; -struct SceneLayer; +struct ViewLayer; struct wmOperatorType; struct wmKeyConfig; struct wmManipulatorGroupType; @@ -147,19 +147,19 @@ void draw_motion_paths_cleanup(View3D *v3d); /* drawobject.c */ void draw_object( - const struct EvaluationContext *eval_ctx, Scene *scene, struct SceneLayer *sl, struct ARegion *ar, View3D *v3d, + const struct EvaluationContext *eval_ctx, Scene *scene, struct ViewLayer *sl, struct ARegion *ar, View3D *v3d, struct Base *base, const short dflag); void draw_object_select( - const struct EvaluationContext *eval_ctx, Scene *scene, struct SceneLayer *sl, struct ARegion *ar, View3D *v3d, + const struct EvaluationContext *eval_ctx, Scene *scene, struct ViewLayer *sl, struct ARegion *ar, View3D *v3d, Base *base, const short dflag); void draw_mesh_object_outline(View3D *v3d, Object *ob, struct DerivedMesh *dm, const unsigned char ob_wire_col[4]); -bool draw_glsl_material(Scene *scene, struct SceneLayer *sl, struct Object *ob, View3D *v3d, const char dt); -void draw_object_instance(const struct EvaluationContext *eval_ctx, Scene *scene, struct SceneLayer *sl, View3D *v3d, RegionView3D *rv3d, struct Object *ob, const char dt, int outline, const float wire_col[4]); +bool draw_glsl_material(Scene *scene, struct ViewLayer *sl, struct Object *ob, View3D *v3d, const char dt); +void draw_object_instance(const struct EvaluationContext *eval_ctx, Scene *scene, struct ViewLayer *sl, View3D *v3d, RegionView3D *rv3d, struct Object *ob, const char dt, int outline, const float wire_col[4]); void draw_object_backbufsel(const struct EvaluationContext *eval_ctx, Scene *scene, View3D *v3d, RegionView3D *rv3d, struct Object *ob); -void draw_object_wire_color(Scene *scene, struct SceneLayer *, Base *base, unsigned char r_ob_wire_col[4]); +void draw_object_wire_color(Scene *scene, struct ViewLayer *, Base *base, unsigned char r_ob_wire_col[4]); void drawaxes(const float viewmat_local[4][4], float size, char drawtype, const unsigned char color[4]); void drawlamp(View3D *v3d, RegionView3D *rv3d, Base *base, const char dt, const short dflag, const unsigned char ob_wire_col[4], @@ -190,12 +190,12 @@ int view3d_effective_drawtype(const struct View3D *v3d); /* drawarmature.c */ bool draw_armature( - const struct EvaluationContext *eval_ctx, Scene *scene, struct SceneLayer *sl, View3D *v3d, ARegion *ar, Base *base, + const struct EvaluationContext *eval_ctx, Scene *scene, struct ViewLayer *sl, View3D *v3d, ARegion *ar, Base *base, const short dt, const short dflag, const unsigned char ob_wire_col[4], const bool is_outline); /* drawmesh.c */ -void draw_mesh_textured(Scene *scene, struct SceneLayer *sl, View3D *v3d, RegionView3D *rv3d, +void draw_mesh_textured(Scene *scene, struct ViewLayer *sl, View3D *v3d, RegionView3D *rv3d, struct Object *ob, struct DerivedMesh *dm, const int draw_flags); void draw_mesh_face_select( struct RegionView3D *rv3d, struct Mesh *me, struct DerivedMesh *dm, @@ -227,7 +227,7 @@ void view3d_main_region_draw_legacy(const struct bContext *C, struct ARegion *ar void ED_view3d_draw_depth_gpencil(const struct EvaluationContext *eval_ctx, Scene *scene, ARegion *ar, View3D *v3d); void ED_view3d_draw_select_loop( - const struct EvaluationContext *eval_ctx, ViewContext *vc, Scene *scene, struct SceneLayer *sl, View3D *v3d, ARegion *ar, + const struct EvaluationContext *eval_ctx, ViewContext *vc, Scene *scene, struct ViewLayer *sl, View3D *v3d, ARegion *ar, bool use_obedit_skip, bool use_nearest); void ED_view3d_draw_depth_loop( @@ -362,7 +362,7 @@ extern bool view3d_camera_border_hack_test; #endif /* temporary for legacy viewport to work */ -void VP_legacy_drawcursor(Scene *scene, struct SceneLayer *sl, ARegion *ar, View3D *v3d); +void VP_legacy_drawcursor(Scene *scene, struct ViewLayer *sl, ARegion *ar, View3D *v3d); void VP_legacy_draw_view_axis(RegionView3D *rv3d, rcti *rect); void VP_legacy_draw_viewport_name(ARegion *ar, View3D *v3d, rcti *rect); void VP_legacy_draw_selected_name(Scene *scene, Object *ob, rcti *rect); @@ -371,7 +371,7 @@ void VP_legacy_drawfloor(Scene *scene, View3D *v3d, const char **grid_unit, bool void VP_legacy_view3d_main_region_setup_view(const struct EvaluationContext *eval_ctx, Scene *scene, View3D *v3d, ARegion *ar, float viewmat[4][4], float winmat[4][4]); bool VP_legacy_view3d_stereo3d_active(struct wmWindow *win, Scene *scene, View3D *v3d, RegionView3D *rv3d); void VP_legacy_view3d_stereo3d_setup(const struct EvaluationContext *eval_ctx, Scene *scene, View3D *v3d, ARegion *ar); -void draw_dupli_objects(const struct EvaluationContext *eval_ctx, Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d, Base *base); +void draw_dupli_objects(const struct EvaluationContext *eval_ctx, Scene *scene, ViewLayer *sl, ARegion *ar, View3D *v3d, Base *base); bool VP_legacy_use_depth(Scene *scene, View3D *v3d); void VP_drawviewborder(Scene *scene, ARegion *ar, View3D *v3d); void VP_drawrenderborder(ARegion *ar, View3D *v3d); diff --git a/source/blender/editors/space_view3d/view3d_manipulator_camera.c b/source/blender/editors/space_view3d/view3d_manipulator_camera.c index e8a1b5cea89..7db294507c3 100644 --- a/source/blender/editors/space_view3d/view3d_manipulator_camera.c +++ b/source/blender/editors/space_view3d/view3d_manipulator_camera.c @@ -294,7 +294,7 @@ static bool WIDGETGROUP_camera_view_poll(const bContext *C, wmManipulatorGroupTy * stealing mouse clicks from regular usage. * We could change the rules for when to show. */ { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); if (scene->camera != OBACT(sl)) { return false; } diff --git a/source/blender/editors/space_view3d/view3d_manipulator_ruler.c b/source/blender/editors/space_view3d/view3d_manipulator_ruler.c index 01cf67259a4..0495d1d696c 100644 --- a/source/blender/editors/space_view3d/view3d_manipulator_ruler.c +++ b/source/blender/editors/space_view3d/view3d_manipulator_ruler.c @@ -272,7 +272,7 @@ static void ruler_state_set(bContext *C, RulerInfo *ruler_info, int state) } else if (state == RULER_STATE_DRAG) { ruler_info->snap_context = ED_transform_snap_object_context_create_view3d( - CTX_data_main(C), CTX_data_scene(C), CTX_data_scene_layer(C), CTX_data_engine(C), 0, + CTX_data_main(C), CTX_data_scene(C), CTX_data_view_layer(C), CTX_data_engine(C), 0, ruler_info->ar, CTX_wm_view3d(C)); } else { diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c index 03f4f506c13..5d213962ae9 100644 --- a/source/blender/editors/space_view3d/view3d_ruler.c +++ b/source/blender/editors/space_view3d/view3d_ruler.c @@ -282,7 +282,7 @@ static void ruler_state_set(bContext *C, RulerInfo *ruler_info, int state) } else if (state == RULER_STATE_DRAG) { ruler_info->snap_context = ED_transform_snap_object_context_create_view3d( - CTX_data_main(C), CTX_data_scene(C), CTX_data_scene_layer(C), CTX_data_engine(C), 0, + CTX_data_main(C), CTX_data_scene(C), CTX_data_view_layer(C), CTX_data_engine(C), 0, ruler_info->ar, CTX_wm_view3d(C)); } else { diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 297bd5c4aa1..0d86d95c779 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -112,7 +112,7 @@ void view3d_set_viewcontext(bContext *C, ViewContext *vc) vc->ar = CTX_wm_region(C); vc->depsgraph = CTX_data_depsgraph(C); vc->scene = CTX_data_scene(C); - vc->scene_layer = CTX_data_scene_layer(C); + vc->view_layer = CTX_data_view_layer(C); vc->engine = CTX_data_engine(C); vc->v3d = CTX_wm_view3d(C); vc->win = CTX_wm_window(C); @@ -376,7 +376,7 @@ static void do_lasso_select_pose(ViewContext *vc, Object *ob, const int mcords[] } } -static void object_deselect_all_visible(SceneLayer *sl) +static void object_deselect_all_visible(ViewLayer *sl) { Base *base; @@ -393,9 +393,9 @@ static void do_lasso_select_objects(ViewContext *vc, const int mcords[][2], cons Base *base; if (extend == false && select) - object_deselect_all_visible(vc->scene_layer); + object_deselect_all_visible(vc->view_layer); - for (base = vc->scene_layer->object_bases.first; base; base = base->next) { + for (base = vc->view_layer->object_bases.first; base; base = base->next) { if (BASE_SELECTABLE(base)) { /* use this to avoid un-needed lasso lookups */ if (ED_view3d_project_base(vc->ar, base) == V3D_PROJ_RET_OK) { if (BLI_lasso_is_point_inside(mcords, moves, base->sx, base->sy, IS_CLIPPED)) { @@ -1057,7 +1057,7 @@ void VIEW3D_OT_select_menu(wmOperatorType *ot) RNA_def_boolean(ot->srna, "toggle", 0, "Toggle", "Toggle selection instead of deselecting everything first"); } -static void deselectall_except(SceneLayer *sl, Base *b) /* deselect all except b */ +static void deselectall_except(ViewLayer *sl, Base *b) /* deselect all except b */ { for (Base *base = sl->object_bases.first; base; base = base->next) { if (base->flag & BASE_SELECTED) { @@ -1274,7 +1274,7 @@ finally: static Base *mouse_select_eval_buffer(ViewContext *vc, unsigned int *buffer, int hits, Base *startbase, bool has_bones, bool do_nearest) { - SceneLayer *sl = vc->scene_layer; + ViewLayer *sl = vc->view_layer; Base *base, *basact = NULL; int a; @@ -1374,7 +1374,7 @@ Base *ED_view3d_give_base_under_cursor(bContext *C, const int mval[2]) if (hits > 0) { const bool has_bones = selectbuffer_has_bones(buffer, hits); - basact = mouse_select_eval_buffer(&vc, buffer, hits, vc.scene_layer->object_bases.first, has_bones, do_nearest); + basact = mouse_select_eval_buffer(&vc, buffer, hits, vc.view_layer->object_bases.first, has_bones, do_nearest); } return basact; @@ -1408,7 +1408,7 @@ static bool ed_object_select_pick( ViewContext vc; ARegion *ar = CTX_wm_region(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Base *base, *startbase = NULL, *basact = NULL, *oldbasact = NULL; bool is_obedit; float dist = ED_view3d_select_dist_px() * 1.3333f; @@ -2066,7 +2066,7 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, b CTX_DATA_END; } else { - object_deselect_all_visible(vc->scene_layer); + object_deselect_all_visible(vc->view_layer); } } @@ -2093,7 +2093,7 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, b * Even though 'DRW_draw_select_loop' uses 'DEG_OBJECT_ITER', * we can be sure the order remains the same between both. */ - for (base = vc->scene_layer->object_bases.first; base && hits; base = base->next) { + for (base = vc->view_layer->object_bases.first; base && hits; base = base->next) { if (BASE_SELECTABLE(base)) { while (base->object->select_color == (*col & 0xFFFF)) { /* we got an object */ if (*col & 0xFFFF0000) { /* we got a bone */ @@ -2828,7 +2828,7 @@ static void obedit_circle_select( static bool object_circle_select(ViewContext *vc, const bool select, const int mval[2], float rad) { - SceneLayer *sl = vc->scene_layer; + ViewLayer *sl = vc->view_layer; const float radius_squared = rad * rad; const float mval_fl[2] = {mval[0], mval[1]}; bool changed = false; diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 4e98386be97..96c8cee407f 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -546,7 +546,7 @@ void VIEW3D_OT_camera_to_view(wmOperatorType *ot) static int view3d_camera_to_view_selected_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); View3D *v3d = CTX_wm_view3d(C); /* can be NULL */ Object *camera_ob = v3d ? v3d->camera : scene->camera; @@ -1326,7 +1326,7 @@ finally: return hits; } -int ED_view3d_scene_layer_set(int lay, const int *values, int *active) +int ED_view3d_view_layer_set(int lay, const int *values, int *active) { int i, tot = 0; diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c index 95390fe9065..2901588b040 100644 --- a/source/blender/editors/space_view3d/view3d_walk.c +++ b/source/blender/editors/space_view3d/view3d_walk.c @@ -250,7 +250,7 @@ typedef struct WalkInfo { View3D *v3d; ARegion *ar; Scene *scene; - SceneLayer *scene_layer; + ViewLayer *view_layer; RenderEngineType *engine; wmTimer *timer; /* needed for redraws */ @@ -514,7 +514,7 @@ static bool initWalkInfo(bContext *C, WalkInfo *walk, wmOperator *op) walk->v3d = CTX_wm_view3d(C); walk->ar = CTX_wm_region(C); walk->scene = CTX_data_scene(C); - walk->scene_layer = CTX_data_scene_layer(C); + walk->view_layer = CTX_data_view_layer(C); walk->engine = CTX_data_engine(C); #ifdef NDOF_WALK_DEBUG @@ -604,7 +604,7 @@ static bool initWalkInfo(bContext *C, WalkInfo *walk, wmOperator *op) walk->rv3d->rflag |= RV3D_NAVIGATING; walk->snap_context = ED_transform_snap_object_context_create_view3d( - CTX_data_main(C), walk->scene, walk->scene_layer, walk->engine, 0, + CTX_data_main(C), walk->scene, walk->view_layer, walk->engine, 0, walk->ar, walk->v3d); walk->v3d_camera_control = ED_view3d_cameracontrol_acquire( diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index e036ffd526c..9db17f3e2e5 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1905,7 +1905,7 @@ static void drawTransformPixel(const struct bContext *UNUSED(C), ARegion *ar, vo { TransInfo *t = arg; Scene *scene = t->scene; - SceneLayer *sl = t->scene_layer; + ViewLayer *sl = t->view_layer; Object *ob = OBACT(sl); /* draw autokeyframing hint in the corner diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 60ad61e3475..39e88f199fc 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -52,7 +52,7 @@ struct Object; struct View3D; struct ScrArea; struct Scene; -struct SceneLayer; +struct ViewLayer; struct bConstraint; struct wmKeyMap; struct wmKeyConfig; @@ -469,7 +469,7 @@ typedef struct TransInfo { struct ScrArea *sa; struct ARegion *ar; struct Scene *scene; - struct SceneLayer *scene_layer; + struct ViewLayer *view_layer; struct RenderEngineType *engine; struct ToolSettings *settings; struct wmTimer *animtimer; @@ -661,7 +661,7 @@ bool transdata_check_local_islands(TransInfo *t, short around); int count_set_pose_transflags(int *out_mode, short around, struct Object *ob); /* auto-keying stuff used by special_aftertrans_update */ -void autokeyframe_ob_cb_func(struct bContext *C, struct Scene *scene, struct SceneLayer *sl, struct View3D *v3d, struct Object *ob, int tmode); +void autokeyframe_ob_cb_func(struct bContext *C, struct Scene *scene, struct ViewLayer *sl, struct View3D *v3d, struct Object *ob, int tmode); void autokeyframe_pose_cb_func(struct bContext *C, struct Scene *scene, struct View3D *v3d, struct Object *ob, int tmode, short targetless_ik); /*********************** Constraints *****************************/ diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 0905e3785da..afe9e149b24 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -286,7 +286,7 @@ static void set_prop_dist(TransInfo *t, const bool with_dist) static void createTransTexspace(TransInfo *t) { - SceneLayer *sl = t->scene_layer; + ViewLayer *sl = t->view_layer; TransData *td; Object *ob; ID *id; @@ -1893,7 +1893,7 @@ static void createTransParticleVerts(bContext *C, TransInfo *t) Base *base = CTX_data_active_base(C); Object *ob = CTX_data_active_object(C); ParticleEditSettings *pset = PE_settings(t->scene); - PTCacheEdit *edit = PE_get_current(t->scene, t->scene_layer, ob); + PTCacheEdit *edit = PE_get_current(t->scene, t->view_layer, ob); ParticleSystem *psys = NULL; ParticleSystemModifierData *psmd = NULL; PTCacheEditPoint *point; @@ -2010,7 +2010,7 @@ static void createTransParticleVerts(bContext *C, TransInfo *t) void flushTransParticles(TransInfo *t) { Scene *scene = t->scene; - SceneLayer *sl = t->scene_layer; + ViewLayer *sl = t->view_layer; Object *ob = OBACT(sl); PTCacheEdit *edit = PE_get_current(scene, sl, ob); ParticleSystem *psys = edit->psys; @@ -2485,7 +2485,7 @@ static void createTransEditVerts(TransInfo *t) int *island_vert_map = NULL; DEG_evaluation_context_init_from_scene(&eval_ctx, - t->scene, t->scene_layer, t->engine, + t->scene, t->view_layer, t->engine, DAG_EVAL_VIEWPORT); /* Even for translation this is needed because of island-orientation, see: T51651. */ @@ -5538,7 +5538,7 @@ static void set_trans_object_base_flags(TransInfo *t) { /* TODO(sergey): Get rid of global, use explicit main. */ Main *bmain = G.main; - SceneLayer *sl = t->scene_layer; + ViewLayer *sl = t->view_layer; Scene *scene = t->scene; Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, sl, true); @@ -5553,7 +5553,7 @@ static void set_trans_object_base_flags(TransInfo *t) return; /* makes sure base flags and object flags are identical */ - BKE_scene_base_flag_to_objects(t->scene_layer); + BKE_scene_base_flag_to_objects(t->view_layer); /* Make sure depsgraph is here. */ DEG_graph_relations_update(depsgraph, bmain, scene, sl); @@ -5561,7 +5561,7 @@ static void set_trans_object_base_flags(TransInfo *t) /* handle pending update events, otherwise they got copied below */ EvaluationContext eval_ctx; DEG_evaluation_context_init_from_scene(&eval_ctx, - t->scene, t->scene_layer, t->engine, + t->scene, t->view_layer, t->engine, DAG_EVAL_VIEWPORT); for (base = sl->object_bases.first; base; base = base->next) { if (base->object->recalc & OB_RECALC_ALL) { @@ -5580,7 +5580,7 @@ static void set_trans_object_base_flags(TransInfo *t) /* if parent selected, deselect */ while (parsel) { if (parsel->base_flag & BASE_SELECTED) { - Base *parbase = BKE_scene_layer_base_find(sl, parsel); + Base *parbase = BKE_view_layer_base_find(sl, parsel); if (parbase) { /* in rare cases this can fail */ if (TESTBASELIB_BGMODE(parbase)) { break; @@ -5639,7 +5639,7 @@ static int count_proportional_objects(TransInfo *t) int total = 0; /* TODO(sergey): Get rid of global, use explicit main. */ Main *bmain = G.main; - SceneLayer *sl = t->scene_layer; + ViewLayer *sl = t->view_layer; Scene *scene = t->scene; Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, sl, true); Base *base; @@ -5707,7 +5707,7 @@ static int count_proportional_objects(TransInfo *t) static void clear_trans_object_base_flags(TransInfo *t) { - SceneLayer *sl = t->scene_layer; + ViewLayer *sl = t->view_layer; Base *base; for (base = sl->object_bases.first; base; base = base->next) { @@ -5723,7 +5723,7 @@ static void clear_trans_object_base_flags(TransInfo *t) * tmode: should be a transform mode */ // NOTE: context may not always be available, so must check before using it as it's a luxury for a few cases -void autokeyframe_ob_cb_func(bContext *C, Scene *scene, SceneLayer *sl, View3D *v3d, Object *ob, int tmode) +void autokeyframe_ob_cb_func(bContext *C, Scene *scene, ViewLayer *sl, View3D *v3d, Object *ob, int tmode) { ID *id = &ob->id; FCurve *fcu; @@ -6500,10 +6500,10 @@ void special_aftertrans_update(bContext *C, TransInfo *t) else if (t->options & CTX_PAINT_CURVE) { /* pass */ } - else if ((t->scene_layer->basact) && - (ob = t->scene_layer->basact->object) && + else if ((t->view_layer->basact) && + (ob = t->view_layer->basact->object) && (ob->mode & OB_MODE_PARTICLE_EDIT) && - PE_get_current(t->scene, t->scene_layer, ob)) + PE_get_current(t->scene, t->view_layer, ob)) { /* do nothing */ } @@ -6544,7 +6544,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t) /* Set autokey if necessary */ if (!canceled) { - autokeyframe_ob_cb_func(C, t->scene, t->scene_layer, (View3D *)t->view, ob, t->mode); + autokeyframe_ob_cb_func(C, t->scene, t->view_layer, (View3D *)t->view, ob, t->mode); } /* restore rigid body transform */ @@ -6628,10 +6628,10 @@ static void createTransObject(bContext *C, TransInfo *t) CTX_DATA_END; if (is_prop_edit) { - SceneLayer *sl = t->scene_layer; + ViewLayer *view_layer = t->view_layer; Base *base; - for (base = sl->object_bases.first; base; base = base->next) { + for (base = view_layer->object_bases.first; base; base = base->next) { Object *ob = base->object; /* if base is not selected, not a parent of selection or not a child of selection and it is editable */ @@ -8084,7 +8084,7 @@ static void createTransGPencil(bContext *C, TransInfo *t) void createTransData(bContext *C, TransInfo *t) { Scene *scene = t->scene; - SceneLayer *sl = t->scene_layer; + ViewLayer *sl = t->view_layer; Object *ob = OBACT(sl); /* if tests must match recalcData for correct updates */ @@ -8250,7 +8250,7 @@ void createTransData(bContext *C, TransInfo *t) * lines below just check is also visible */ Object *ob_armature = modifiers_isDeformedByArmature(ob); if (ob_armature && ob_armature->mode & OB_MODE_POSE) { - Base *base_arm = BKE_scene_layer_base_find(t->scene_layer, ob_armature); + Base *base_arm = BKE_view_layer_base_find(t->view_layer, ob_armature); if (base_arm) { if (BASE_VISIBLE(base_arm)) { createTransPose(t, ob_armature); diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 8d2fb595e24..90c4b1a17c0 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -318,7 +318,7 @@ static bool fcu_test_selected(FCurve *fcu) /* helper for recalcData() - for Action Editor transforms */ static void recalcData_actedit(TransInfo *t) { - SceneLayer *sl = t->scene_layer; + ViewLayer *sl = t->view_layer; SpaceAction *saction = (SpaceAction *)t->sa->spacedata.first; bAnimContext ac = {NULL}; @@ -329,7 +329,7 @@ static void recalcData_actedit(TransInfo *t) /* initialize relevant anim-context 'context' data from TransInfo data */ /* NOTE: sync this with the code in ANIM_animdata_get_context() */ ac.scene = t->scene; - ac.scene_layer = t->scene_layer; + ac.view_layer = t->view_layer; ac.obact = OBACT(sl); ac.sa = t->sa; ac.ar = t->ar; @@ -367,7 +367,7 @@ static void recalcData_actedit(TransInfo *t) static void recalcData_graphedit(TransInfo *t) { SpaceIpo *sipo = (SpaceIpo *)t->sa->spacedata.first; - SceneLayer *sl = t->scene_layer; + ViewLayer *sl = t->view_layer; ListBase anim_data = {NULL, NULL}; bAnimContext ac = {NULL}; @@ -379,7 +379,7 @@ static void recalcData_graphedit(TransInfo *t) /* initialize relevant anim-context 'context' data from TransInfo data */ /* NOTE: sync this with the code in ANIM_animdata_get_context() */ ac.scene = t->scene; - ac.scene_layer = t->scene_layer; + ac.view_layer = t->view_layer; ac.obact = OBACT(sl); ac.sa = t->sa; ac.ar = t->ar; @@ -714,7 +714,7 @@ static void recalcData_spaceclip(TransInfo *t) /* helper for recalcData() - for object transforms, typically in the 3D view */ static void recalcData_objects(TransInfo *t) { - Base *base = t->scene_layer->basact; + Base *base = t->view_layer->basact; EvaluationContext eval_ctx; CTX_data_eval_ctx(t->context, &eval_ctx); @@ -904,7 +904,7 @@ static void recalcData_objects(TransInfo *t) else BKE_pose_where_is(&eval_ctx, t->scene, ob); } - else if (base && (base->object->mode & OB_MODE_PARTICLE_EDIT) && PE_get_current(t->scene, t->scene_layer, base->object)) { + else if (base && (base->object->mode & OB_MODE_PARTICLE_EDIT) && PE_get_current(t->scene, t->view_layer, base->object)) { if (t->state != TRANS_CANCEL) { applyProject(t); } @@ -934,7 +934,7 @@ static void recalcData_objects(TransInfo *t) // TODO: autokeyframe calls need some setting to specify to add samples (FPoints) instead of keyframes? if ((t->animtimer) && IS_AUTOKEY_ON(t->scene)) { animrecord_check_state(t->scene, &ob->id, t->animtimer); - autokeyframe_ob_cb_func(t->context, t->scene, t->scene_layer, (View3D *)t->view, ob, t->mode); + autokeyframe_ob_cb_func(t->context, t->scene, t->view_layer, (View3D *)t->view, ob, t->mode); } /* sets recalc flags fully, instead of flushing existing ones @@ -1116,7 +1116,7 @@ static int initTransInfo_edit_pet_to_flag(const int proportional) void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *event) { Scene *sce = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); ToolSettings *ts = CTX_data_tool_settings(C); ARegion *ar = CTX_wm_region(C); ScrArea *sa = CTX_wm_area(C); @@ -1127,7 +1127,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve PropertyRNA *prop; t->scene = sce; - t->scene_layer = sl; + t->view_layer = sl; t->engine = engine; t->sa = sa; t->ar = ar; @@ -1802,7 +1802,7 @@ bool calculateCenterActive(TransInfo *t, bool select_only, float r_center[3]) } } else if (t->flag & T_POSE) { - SceneLayer *sl = t->scene_layer; + ViewLayer *sl = t->view_layer; Object *ob = OBACT(sl); if (ob) { bPoseChannel *pchan = BKE_pose_channel_active(ob); @@ -1813,7 +1813,7 @@ bool calculateCenterActive(TransInfo *t, bool select_only, float r_center[3]) } } else if (t->options & CTX_PAINT_CURVE) { - Paint *p = BKE_paint_get_active(t->scene, t->scene_layer); + Paint *p = BKE_paint_get_active(t->scene, t->view_layer); Brush *br = p->brush; PaintCurve *pc = br->paint_curve; copy_v3_v3(r_center, pc->points[pc->add_index - 1].bez.vec[1]); @@ -1822,7 +1822,7 @@ bool calculateCenterActive(TransInfo *t, bool select_only, float r_center[3]) } else { /* object mode */ - SceneLayer *sl = t->scene_layer; + ViewLayer *sl = t->view_layer; Object *ob = OBACT(sl); Base *base = BASACT(sl); if (ob && ((!select_only) || ((base->flag & BASE_SELECTED) != 0))) { diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index be33cb85f0e..e23e7f6e1bb 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -591,7 +591,7 @@ static int calc_manipulator_stats( ScrArea *sa = CTX_wm_area(C); ARegion *ar = CTX_wm_region(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *obedit = CTX_data_edit_object(C); View3D *v3d = sa->spacedata.first; RegionView3D *rv3d = ar->regiondata; @@ -1055,7 +1055,7 @@ static void manipulator_prepare_mat( const bContext *C, View3D *v3d, RegionView3D *rv3d, const struct TransformBounds *tbounds) { Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); switch (v3d->around) { case V3D_AROUND_CENTER_BOUNDS: @@ -1590,7 +1590,7 @@ static void WIDGETGROUP_xform_cage_draw_prepare(const bContext *C, wmManipulator struct XFormCageWidgetGroup *xmgroup = mgroup->customdata; wmManipulator *mpr = xmgroup->manipulator; - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob = OBACT(sl); if (ob && ob->mode & OB_MODE_EDIT) { copy_m4_m4(mpr->matrix_space, ob->obmat); diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 86f99c4fed2..09f3613358e 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -578,7 +578,7 @@ static unsigned int bm_mesh_faces_select_get_n(BMesh *bm, BMVert **elems, const int getTransformOrientation_ex(const bContext *C, float normal[3], float plane[3], const short around) { - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *obedit = CTX_data_edit_object(C); Base *base; Object *ob = OBACT(sl); diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 3a71800e9cd..52c3f135473 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -503,7 +503,7 @@ static void initSnappingMode(TransInfo *t) { ToolSettings *ts = t->settings; Object *obedit = t->obedit; - SceneLayer *sl = t->scene_layer; + ViewLayer *sl = t->view_layer; Base *base_act = sl->basact; if (t->spacetype == SPACE_NODE) { @@ -585,7 +585,7 @@ static void initSnappingMode(TransInfo *t) if (t->spacetype == SPACE_VIEW3D) { if (t->tsnap.object_context == NULL) { t->tsnap.object_context = ED_transform_snap_object_context_create_view3d( - G.main, t->scene, t->scene_layer, t->engine, 0, + G.main, t->scene, t->view_layer, t->engine, 0, t->ar, t->view); ED_transform_snap_object_context_set_editmesh_callbacks( diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 135ea406d60..50ae34dd45e 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -160,7 +160,7 @@ static void iter_snap_objects( IterSnapObjsCallback sob_callback, void *data) { - Base *base_act = sctx->eval_ctx.scene_layer->basact; + Base *base_act = sctx->eval_ctx.view_layer->basact; /* Need an exception for particle edit because the base is flagged with BA_HAS_RECALC_DATA * which makes the loop skip it, even the derived mesh will never change * @@ -170,7 +170,7 @@ static void iter_snap_objects( sob_callback(sctx, false, base_act->object, base_act->object->obmat, data); } - for (Base *base = sctx->eval_ctx.scene_layer->object_bases.first; base != NULL; base = base->next) { + for (Base *base = sctx->eval_ctx.view_layer->object_bases.first; base != NULL; base = base->next) { if ((BASE_VISIBLE(base)) && (base->flag_legacy & (BA_HAS_RECALC_OB | BA_HAS_RECALC_DATA)) == 0 && !((snap_select == SNAP_NOT_SELECTED && ((base->flag & BASE_SELECTED) || (base->flag_legacy & BA_WAS_SEL))) || (snap_select == SNAP_NOT_ACTIVE && base == base_act))) @@ -2096,7 +2096,7 @@ static bool snapObjectsRay( * \{ */ SnapObjectContext *ED_transform_snap_object_context_create( - Main *bmain, Scene *scene, SceneLayer *sl, RenderEngineType *engine, int flag) + Main *bmain, Scene *scene, ViewLayer *sl, RenderEngineType *engine, int flag) { SnapObjectContext *sctx = MEM_callocN(sizeof(*sctx), __func__); @@ -2114,7 +2114,7 @@ SnapObjectContext *ED_transform_snap_object_context_create( } SnapObjectContext *ED_transform_snap_object_context_create_view3d( - Main *bmain, Scene *scene, SceneLayer *sl, RenderEngineType *engine, int flag, + Main *bmain, Scene *scene, ViewLayer *sl, RenderEngineType *engine, int flag, /* extra args for view3d */ const ARegion *ar, const View3D *v3d) { diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index d0f29abc62f..e74c909e36e 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -88,7 +88,7 @@ void ED_editors_init(bContext *C) wmWindowManager *wm = CTX_wm_manager(C); Main *bmain = CTX_data_main(C); Scene *sce = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *ob, *obact = (sl && sl->basact) ? sl->basact->object : NULL; ID *data; diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c index 5b91ee4fc29..aa636699679 100644 --- a/source/blender/editors/util/undo.c +++ b/source/blender/editors/util/undo.c @@ -101,7 +101,7 @@ void ED_undo_push(bContext *C, const char *str) else if (obact && obact->mode & OB_MODE_PARTICLE_EDIT) { if (U.undosteps == 0) return; - PE_undo_push(CTX_data_scene(C), CTX_data_scene_layer(C), str); + PE_undo_push(CTX_data_scene(C), CTX_data_view_layer(C), str); } else if (obact && obact->mode & OB_MODE_SCULPT) { /* do nothing for now */ @@ -120,7 +120,7 @@ static int ed_undo_step(bContext *C, int step, const char *undoname) wmWindow *win = CTX_wm_window(C); Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); + ViewLayer *sl = CTX_data_view_layer(C); Object *obedit = CTX_data_edit_object(C); Object *obact = CTX_data_active_object(C); ScrArea *sa = CTX_wm_area(C); @@ -298,7 +298,7 @@ bool ED_undo_is_valid(const bContext *C, const char *undoname) return 1; } else if (obact && obact->mode & OB_MODE_PARTICLE_EDIT) { - return PE_undo_is_valid(CTX_data_scene(C), CTX_data_scene_layer(C)); + return PE_undo_is_valid(CTX_data_scene(C), CTX_data_view_layer(C)); } if (U.uiflag & USER_GLOBALUNDO) { @@ -543,7 +543,7 @@ static const EnumPropertyItem *rna_undo_itemf(bContext *C, int undosys, int *tot const char *name = NULL; if (undosys == UNDOSYSTEM_PARTICLE) { - name = PE_undo_get_name(CTX_data_scene(C), CTX_data_scene_layer(C), i, &active); + name = PE_undo_get_name(CTX_data_scene(C), CTX_data_view_layer(C), i, &active); } else if (undosys == UNDOSYSTEM_EDITMODE) { name = undo_editmode_get_name(C, i, &active); @@ -626,7 +626,7 @@ static int undo_history_exec(bContext *C, wmOperator *op) int item = RNA_int_get(op->ptr, "item"); if (undosys == UNDOSYSTEM_PARTICLE) { - PE_undo_number(CTX_data_scene(C), CTX_data_scene_layer(C), item); + PE_undo_number(CTX_data_scene(C), CTX_data_view_layer(C), item); } else if (undosys == UNDOSYSTEM_EDITMODE) { undo_editmode_number(C, item + 1); diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 100c30459e9..43e779dead1 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -517,7 +517,7 @@ static void draw_uvs_other_mesh(Object *ob, const Image *curimage, const bool ne } } -static void draw_uvs_other(SceneLayer *sl, Object *obedit, const Image *curimage, const bool new_shading_nodes, +static void draw_uvs_other(ViewLayer *sl, Object *obedit, const Image *curimage, const bool new_shading_nodes, const int other_uv_filter) { unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT); @@ -539,7 +539,7 @@ static void draw_uvs_other(SceneLayer *sl, Object *obedit, const Image *curimage immUnbindProgram(); } -static void draw_uvs_texpaint(SpaceImage *sima, Scene *scene, SceneLayer *sl, Object *ob) +static void draw_uvs_texpaint(SpaceImage *sima, Scene *scene, ViewLayer *sl, Object *ob) { const bool new_shading_nodes = BKE_scene_use_new_shading_nodes(scene); Image *curimage = ED_space_image(sima); @@ -604,7 +604,7 @@ static void draw_uvs_looptri(BMEditMesh *em, unsigned int *r_loop_index, const i } /* draws uv's in the image space */ -static void draw_uvs(SpaceImage *sima, Scene *scene, SceneLayer *sl, Object *obedit, Depsgraph *depsgraph) +static void draw_uvs(SpaceImage *sima, Scene *scene, ViewLayer *sl, Object *obedit, Depsgraph *depsgraph) { const bool new_shading_nodes = BKE_scene_use_new_shading_nodes(scene); ToolSettings *ts; @@ -1045,7 +1045,7 @@ static void draw_uv_shadows_get(SpaceImage *sima, Object *ob, Object *obedit, bo *show_texpaint = (ob && ob->type == OB_MESH && ob->mode == OB_MODE_TEXTURE_PAINT); } -void ED_uvedit_draw_main(SpaceImage *sima, ARegion *ar, Scene *scene, SceneLayer *sl, Object *obedit, Object *obact, Depsgraph *depsgraph) +void ED_uvedit_draw_main(SpaceImage *sima, ARegion *ar, Scene *scene, ViewLayer *sl, Object *obedit, Object *obact, Depsgraph *depsgraph) { ToolSettings *toolsettings = scene->toolsettings; bool show_uvedit, show_uvshadow, show_texpaint_uvshadow; diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt index 6106dfa58b2..183eaf595ed 100644 --- a/source/blender/freestyle/CMakeLists.txt +++ b/source/blender/freestyle/CMakeLists.txt @@ -392,8 +392,8 @@ set(SRC intern/scene_graph/NodeGroup.h intern/scene_graph/NodeLight.cpp intern/scene_graph/NodeLight.h - intern/scene_graph/NodeSceneLayer.cpp - intern/scene_graph/NodeSceneLayer.h + intern/scene_graph/NodeViewLayer.cpp + intern/scene_graph/NodeViewLayer.h intern/scene_graph/NodeShape.cpp intern/scene_graph/NodeShape.h intern/scene_graph/NodeTransform.cpp diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h index 4b9e09a9fb7..58f1c343235 100644 --- a/source/blender/freestyle/FRS_freestyle.h +++ b/source/blender/freestyle/FRS_freestyle.h @@ -51,13 +51,13 @@ extern struct FreestyleGlobals g_freestyle; void FRS_initialize(void); void FRS_set_context(struct bContext *C); void FRS_read_file(struct bContext *C); -int FRS_is_freestyle_enabled(struct SceneLayer *scene_layer); +int FRS_is_freestyle_enabled(struct ViewLayer *view_layer); void FRS_init_stroke_renderer(struct Render *re); void FRS_begin_stroke_rendering(struct Render *re); -struct Render *FRS_do_stroke_rendering(struct Render *re, struct SceneLayer *scene_layer, int render); +struct Render *FRS_do_stroke_rendering(struct Render *re, struct ViewLayer *view_layer, int render); void FRS_end_stroke_rendering(struct Render *re); void FRS_free_view_map_cache(void); -void FRS_composite_result(struct Render *re, struct SceneLayer *scene_layer, struct Render *freestyle_render); +void FRS_composite_result(struct Render *re, struct ViewLayer *view_layer, struct Render *freestyle_render); void FRS_exit(void); /* FreestyleConfig.linesets */ diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index 9754cf1de9f..759f6456759 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -40,7 +40,7 @@ extern "C" { #include "../scene_graph/NodeDrawingStyle.h" #include "../scene_graph/NodeShape.h" #include "../scene_graph/NodeTransform.h" -#include "../scene_graph/NodeSceneLayer.h" +#include "../scene_graph/NodeViewLayer.h" #include "../scene_graph/ScenePrettyPrinter.h" #include "../scene_graph/VertexRep.h" @@ -232,9 +232,9 @@ bool Controller::hitViewMapCache() return false; } -int Controller::LoadMesh(Render *re, SceneLayer *scene_layer) +int Controller::LoadMesh(Render *re, ViewLayer *view_layer) { - BlenderFileLoader loader(re, scene_layer); + BlenderFileLoader loader(re, view_layer); loader.setRenderMonitor(_pRenderMonitor); @@ -301,7 +301,7 @@ int Controller::LoadMesh(Render *re, SceneLayer *scene_layer) } cam->setProjectionMatrix(proj); _RootNode->AddChild(cam); - _RootNode->AddChild(new NodeSceneLayer(*re->scene, *scene_layer)); + _RootNode->AddChild(new NodeViewLayer(*re->scene, *view_layer)); sceneHashFunc.reset(); //blenderScene->accept(sceneHashFunc); diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h index 606c80ada3f..0304c18b8a6 100644 --- a/source/blender/freestyle/intern/application/Controller.h +++ b/source/blender/freestyle/intern/application/Controller.h @@ -68,7 +68,7 @@ public: //soc void init_options(); - int LoadMesh(Render *re, SceneLayer *scene_layer); + int LoadMesh(Render *re, ViewLayer *view_layer); int Load3DSFile(const char *iFileName); void CloseFile(); void ComputeViewMap(); diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index b20349acfd1..a0da68849f7 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -32,16 +32,16 @@ namespace Freestyle { -BlenderFileLoader::BlenderFileLoader(Render *re, SceneLayer *scene_layer) +BlenderFileLoader::BlenderFileLoader(Render *re, ViewLayer *view_layer) { _re = re; - _scene_layer = scene_layer; + _view_layer = view_layer; _Scene = NULL; _numFacesRead = 0; #if 0 _minEdgeSize = DBL_MAX; #endif - _smooth = (scene_layer->freestyle_config.flags & FREESTYLE_FACE_SMOOTHNESS_FLAG) != 0; + _smooth = (view_layer->freestyle_config.flags & FREESTYLE_FACE_SMOOTHNESS_FLAG) != 0; _pRenderMonitor = NULL; } diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h index b5530e3af09..ad92416801d 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h @@ -78,7 +78,7 @@ class BlenderFileLoader { public: /*! Builds a MaxFileLoader */ - BlenderFileLoader(Render *re, SceneLayer *scene_layer); + BlenderFileLoader(Render *re, ViewLayer *view_layer); virtual ~BlenderFileLoader(); /*! Loads the 3D scene and returns a pointer to the scene root node */ @@ -114,7 +114,7 @@ protected: unsigned n; }; Render *_re; - SceneLayer *_scene_layer; + ViewLayer *_view_layer; NodeGroup *_Scene; unsigned _numFacesRead; #if 0 diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 847da8067d5..6122ef99964 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -128,11 +128,11 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str DEG_graph_id_tag_update(freestyle_bmain, freestyle_depsgraph, &freestyle_scene->id, 0); // Scene layer. - SceneLayer *scene_layer = (SceneLayer *)freestyle_scene->render_layers.first; - scene_layer->layflag = SCE_LAY_SOLID | SCE_LAY_ZTRA; + ViewLayer *view_layer = (ViewLayer *)freestyle_scene->view_layers.first; + view_layer->layflag = SCE_LAY_SOLID | SCE_LAY_ZTRA; // Camera - Object *object_camera = BKE_object_add(freestyle_bmain, freestyle_scene, scene_layer, OB_CAMERA, NULL); + Object *object_camera = BKE_object_add(freestyle_bmain, freestyle_scene, view_layer, OB_CAMERA, NULL); DEG_graph_id_tag_update(freestyle_bmain, freestyle_depsgraph, &object_camera->id, 0); Camera *camera = (Camera *)object_camera->data; @@ -174,8 +174,8 @@ BlenderStrokeRenderer::~BlenderStrokeRenderer() // compositor has finished. // release objects and data blocks - SceneLayer *scene_layer = (SceneLayer *)freestyle_scene->render_layers.first; - for (Base *b = (Base *)scene_layer->object_bases.first; b; b = b->next) { + ViewLayer *view_layer = (ViewLayer *)freestyle_scene->view_layers.first; + for (Base *b = (Base *)view_layer->object_bases.first; b; b = b->next) { Object *ob = b->object; void *data = ob->data; char *name = ob->id.name; @@ -205,7 +205,7 @@ BlenderStrokeRenderer::~BlenderStrokeRenderer() BLI_freelistN(&sc->objects); } FOREACH_SCENE_COLLECTION_END - BLI_freelistN(&scene_layer->object_bases); + BLI_freelistN(&view_layer->object_bases); // release materials Link *lnk = (Link *)freestyle_bmain->mat.first; @@ -692,7 +692,7 @@ int BlenderStrokeRenderer::get_stroke_count() const void BlenderStrokeRenderer::GenerateStrokeMesh(StrokeGroup *group, bool hasTex) { #if 0 - Object *object_mesh = BKE_object_add(freestyle_bmain, freestyle_scene, (SceneLayer *)freestyle_scene->render_layers.first, OB_MESH); + Object *object_mesh = BKE_object_add(freestyle_bmain, freestyle_scene, (ViewLayer *)freestyle_scene->view_layers.first, OB_MESH); DEG_relations_tag_update(freestyle_bmain); #else Object *object_mesh = NewMesh(); @@ -969,8 +969,8 @@ Render *BlenderStrokeRenderer::RenderScene(Render * /*re*/, bool render) #endif Render *freestyle_render = RE_NewSceneRender(freestyle_scene); - SceneLayer *scene_layer = (SceneLayer *)freestyle_scene->render_layers.first; - DEG_graph_relations_update(freestyle_depsgraph, freestyle_bmain, freestyle_scene, scene_layer); + ViewLayer *view_layer = (ViewLayer *)freestyle_scene->view_layers.first; + DEG_graph_relations_update(freestyle_depsgraph, freestyle_bmain, freestyle_scene, view_layer); freestyle_render->depsgraph = freestyle_depsgraph; RE_RenderFreestyleStrokes(freestyle_render, freestyle_bmain, freestyle_scene, diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 0baad3f5165..e2560a33443 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -283,19 +283,19 @@ static bool test_edge_type_conditions(struct edge_type_condition *conditions, return true; } -static void prepare(Render *re, SceneLayer *scene_layer) +static void prepare(Render *re, ViewLayer *view_layer) { // load mesh re->i.infostr = IFACE_("Freestyle: Mesh loading"); re->stats_draw(re->sdh, &re->i); re->i.infostr = NULL; - if (controller->LoadMesh(re, scene_layer)) // returns if scene cannot be loaded or if empty + if (controller->LoadMesh(re, view_layer)) // returns if scene cannot be loaded or if empty return; if (re->test_break(re->tbh)) return; // add style modules - FreestyleConfig *config = &scene_layer->freestyle_config; + FreestyleConfig *config = &view_layer->freestyle_config; if (G.debug & G_DEBUG_FREESTYLE) { cout << "\n=== Rendering options ===" << endl; @@ -359,7 +359,7 @@ static void prepare(Render *re, SceneLayer *scene_layer) cout << " " << layer_count+1 << ": " << lineset->name << " - " << (lineset->linestyle ? (lineset->linestyle->id.name + 2) : "<NULL>") << endl; } - char *buffer = create_lineset_handler(scene_layer->name, lineset->name); + char *buffer = create_lineset_handler(view_layer->name, lineset->name); controller->InsertStyleModule(layer_count, lineset->name, buffer); controller->toggleLayer(layer_count, true); MEM_freeN(buffer); @@ -445,7 +445,7 @@ static void prepare(Render *re, SceneLayer *scene_layer) } // set diffuse and z depth passes - RenderLayer *rl = RE_GetRenderLayer(re->result, scene_layer->name); + RenderLayer *rl = RE_GetRenderLayer(re->result, view_layer->name); bool diffuse = false, z = false; for (RenderPass *rpass = (RenderPass *)rl->passes.first; rpass; rpass = rpass->next) { if (STREQ(rpass->name, RE_PASSNAME_DIFFUSE)) { @@ -473,7 +473,7 @@ static void prepare(Render *re, SceneLayer *scene_layer) controller->ComputeViewMap(); } -void FRS_composite_result(Render *re, SceneLayer *scene_layer, Render *freestyle_render) +void FRS_composite_result(Render *re, ViewLayer *view_layer, Render *freestyle_render) { RenderLayer *rl; float *src, *dest, *pixSrc, *pixDest; @@ -503,7 +503,7 @@ void FRS_composite_result(Render *re, SceneLayer *scene_layer, Render *freestyle } #endif - rl = RE_GetRenderLayer(re->result, scene_layer->name); + rl = RE_GetRenderLayer(re->result, view_layer->name); if (!rl) { if (G.debug & G_DEBUG_FREESTYLE) { cout << "No destination render layer to composite to" << endl; @@ -536,13 +536,13 @@ void FRS_composite_result(Render *re, SceneLayer *scene_layer, Render *freestyle } } -static int displayed_layer_count(SceneLayer *scene_layer) +static int displayed_layer_count(ViewLayer *view_layer) { int count = 0; - switch (scene_layer->freestyle_config.mode) { + switch (view_layer->freestyle_config.mode) { case FREESTYLE_CONTROL_SCRIPT_MODE: - for (FreestyleModuleConfig *module = (FreestyleModuleConfig *)scene_layer->freestyle_config.modules.first; + for (FreestyleModuleConfig *module = (FreestyleModuleConfig *)view_layer->freestyle_config.modules.first; module; module = module->next) { @@ -551,7 +551,7 @@ static int displayed_layer_count(SceneLayer *scene_layer) } break; case FREESTYLE_CONTROL_EDITOR_MODE: - for (FreestyleLineSet *lineset = (FreestyleLineSet *)scene_layer->freestyle_config.linesets.first; + for (FreestyleLineSet *lineset = (FreestyleLineSet *)view_layer->freestyle_config.linesets.first; lineset; lineset = lineset->next) { @@ -563,11 +563,11 @@ static int displayed_layer_count(SceneLayer *scene_layer) return count; } -int FRS_is_freestyle_enabled(SceneLayer *scene_layer) +int FRS_is_freestyle_enabled(ViewLayer *view_layer) { - return ((scene_layer->flag & SCENE_LAYER_RENDER) && - (scene_layer->flag & SCENE_LAYER_FREESTYLE) && - displayed_layer_count(scene_layer) > 0); + return ((view_layer->flag & VIEW_LAYER_RENDER) && + (view_layer->flag & VIEW_LAYER_FREESTYLE) && + displayed_layer_count(view_layer) > 0); } void FRS_init_stroke_renderer(Render *re) @@ -589,7 +589,7 @@ void FRS_begin_stroke_rendering(Render *re) init_camera(re); } -Render *FRS_do_stroke_rendering(Render *re, SceneLayer *scene_layer, int render) +Render *FRS_do_stroke_rendering(Render *re, ViewLayer *view_layer, int render) { Render *freestyle_render = NULL; @@ -598,12 +598,12 @@ Render *FRS_do_stroke_rendering(Render *re, SceneLayer *scene_layer, int render) RenderMonitor monitor(re); controller->setRenderMonitor(&monitor); - controller->setViewMapCache((scene_layer->freestyle_config.flags & FREESTYLE_VIEW_MAP_CACHE) ? true : false); + controller->setViewMapCache((view_layer->freestyle_config.flags & FREESTYLE_VIEW_MAP_CACHE) ? true : false); if (G.debug & G_DEBUG_FREESTYLE) { cout << endl; cout << "----------------------------------------------------------" << endl; - cout << "| " << (re->scene->id.name + 2) << "|" << scene_layer->name << endl; + cout << "| " << (re->scene->id.name + 2) << "|" << view_layer->name << endl; cout << "----------------------------------------------------------" << endl; } @@ -612,7 +612,7 @@ Render *FRS_do_stroke_rendering(Render *re, SceneLayer *scene_layer, int render) // - add style modules // - set parameters // - compute view map - prepare(re, scene_layer); + prepare(re, view_layer); if (re->test_break(re->tbh)) { controller->CloseFile(); @@ -637,7 +637,7 @@ Render *FRS_do_stroke_rendering(Render *re, SceneLayer *scene_layer, int render) // composite result if (freestyle_render) { - FRS_composite_result(re, scene_layer, freestyle_render); + FRS_composite_result(re, view_layer, freestyle_render); RE_FreeRenderResult(freestyle_render->result); freestyle_render->result = NULL; } diff --git a/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.cpp b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.cpp index c4beed1dbef..701c5caa91d 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.cpp @@ -18,18 +18,18 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/freestyle/intern/scene_graph/NodeSceneLayer.cpp +/** \file blender/freestyle/intern/scene_graph/NodeViewLayer.cpp * \ingroup freestyle * \brief Class to represent a scene render layer in Blender. */ -#include "NodeSceneLayer.h" +#include "NodeViewLayer.h" namespace Freestyle { -void NodeSceneLayer::accept(SceneVisitor& v) +void NodeViewLayer::accept(SceneVisitor& v) { - v.visitNodeSceneLayer(*this); + v.visitNodeViewLayer(*this); } } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.h b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.h index 5b781dff528..cc64fda60b6 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.h +++ b/source/blender/freestyle/intern/scene_graph/NodeViewLayer.h @@ -18,38 +18,38 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __FREESTYLE_NODE_SCENE_LAYER_H__ -#define __FREESTYLE_NODE_SCENE_LAYER_H__ +#ifndef __FREESTYLE_NODE_VIEW_LAYER_H__ +#define __FREESTYLE_NODE_VIEW_LAYER_H__ -/** \file blender/freestyle/intern/scene_graph/NodeSceneLayer.h +/** \file blender/freestyle/intern/scene_graph/NodeViewLayer.h * \ingroup freestyle - * \brief Class to represent a scene render layer in Blender. + * \brief Class to represent a view layer in Blender. */ #include "Node.h" extern "C" { -#include "DNA_scene_types.h" /* for Scene and SceneRenderLayer */ +#include "DNA_scene_types.h" /* for Scene and ViewLayer */ } using namespace std; namespace Freestyle { -class NodeSceneLayer : public Node +class NodeViewLayer : public Node { public: - inline NodeSceneLayer(Scene& scene, SceneLayer& scene_layer) : Node(), _Scene(scene), _SceneLayer(scene_layer) {} - virtual ~NodeSceneLayer() {} + inline NodeViewLayer(Scene& scene, ViewLayer& view_layer) : Node(), _Scene(scene), _ViewLayer(view_layer) {} + virtual ~NodeViewLayer() {} inline struct Scene& scene() const { return _Scene; } - inline struct SceneLayer& sceneLayer() const + inline struct ViewLayer& sceneLayer() const { - return _SceneLayer; + return _ViewLayer; } /*! Accept the corresponding visitor */ @@ -58,9 +58,9 @@ public: protected: Scene& _Scene; - SceneLayer& _SceneLayer; + ViewLayer& _ViewLayer; }; } /* namespace Freestyle */ -#endif // __FREESTYLE_NODE_SCENE_LAYER_H__ +#endif // __FREESTYLE_NODE_VIEW_LAYER_H__ diff --git a/source/blender/freestyle/intern/scene_graph/SceneHash.cpp b/source/blender/freestyle/intern/scene_graph/SceneHash.cpp index 5fdf06a5059..16c353678c1 100644 --- a/source/blender/freestyle/intern/scene_graph/SceneHash.cpp +++ b/source/blender/freestyle/intern/scene_graph/SceneHash.cpp @@ -35,7 +35,7 @@ string SceneHash::toString() return ss.str(); } -void SceneHash::visitNodeSceneLayer(NodeSceneLayer& node) +void SceneHash::visitNodeViewLayer(NodeViewLayer& node) { struct RenderData *r = &node.scene().r; adler32((unsigned char *)&r->xsch, sizeof(r->xsch)); // resolution_x diff --git a/source/blender/freestyle/intern/scene_graph/SceneHash.h b/source/blender/freestyle/intern/scene_graph/SceneHash.h index b21fcf32fe3..662b4bba8f1 100644 --- a/source/blender/freestyle/intern/scene_graph/SceneHash.h +++ b/source/blender/freestyle/intern/scene_graph/SceneHash.h @@ -26,7 +26,7 @@ */ #include "IndexedFaceSet.h" -#include "NodeSceneLayer.h" +#include "NodeViewLayer.h" #include "NodeCamera.h" #include "SceneVisitor.h" @@ -49,7 +49,7 @@ public: virtual ~SceneHash() {} VISIT_DECL(NodeCamera) - VISIT_DECL(NodeSceneLayer) + VISIT_DECL(NodeViewLayer) VISIT_DECL(IndexedFaceSet) string toString(); diff --git a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h index b27abb3625c..d76e48980bf 100644 --- a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h +++ b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h @@ -56,7 +56,7 @@ class NodeLight; class NodeCamera; class NodeDrawingStyle; class NodeTransform; -class NodeSceneLayer; +class NodeViewLayer; class Rep; class LineRep; @@ -88,7 +88,7 @@ public: VISIT_COMPLETE_DEF(NodeCamera) VISIT_COMPLETE_DEF(NodeDrawingStyle) VISIT_COMPLETE_DEF(NodeTransform) - VISIT_COMPLETE_DEF(NodeSceneLayer) + VISIT_COMPLETE_DEF(NodeViewLayer) VISIT_COMPLETE_DEF(Rep) VISIT_COMPLETE_DEF(LineRep) diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h index 53826876738..8d29632fc71 100644 --- a/source/blender/gpu/GPU_draw.h +++ b/source/blender/gpu/GPU_draw.h @@ -41,7 +41,7 @@ struct Image; struct ImageUser; struct Object; struct Scene; -struct SceneLayer; +struct ViewLayer; struct View3D; struct RegionView3D; struct SmokeModifierData; @@ -74,7 +74,7 @@ void GPU_disable_program_point_size(void); * - after drawing, the material must be disabled again */ void GPU_begin_object_materials(struct View3D *v3d, struct RegionView3D *rv3d, - struct Scene *scene, struct SceneLayer *scene_layer, + struct Scene *scene, struct ViewLayer *view_layer, struct Object *ob, bool glsl, bool *do_alpha_after); void GPU_end_object_materials(void); bool GPU_object_materials_check(void); @@ -98,7 +98,7 @@ int GPU_get_material_alpha_blend(void); int GPU_default_lights(void); int GPU_scene_object_lights( - struct SceneLayer *scene_layer, float viewmat[4][4], int ortho); + struct ViewLayer *view_layer, float viewmat[4][4], int ortho); /* Text render * - based on moving uv coordinates */ diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 4e2a492367a..f9cf3235ac1 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -1553,7 +1553,7 @@ void GPU_end_dupli_object(void) } void GPU_begin_object_materials( - View3D *v3d, RegionView3D *rv3d, Scene *scene, SceneLayer *scene_layer, Object *ob, + View3D *v3d, RegionView3D *rv3d, Scene *scene, ViewLayer *view_layer, Object *ob, bool glsl, bool *do_alpha_after) { Material *ma; @@ -1592,10 +1592,10 @@ void GPU_begin_object_materials( #ifdef WITH_GAMEENGINE if (rv3d->rflag & RV3D_IS_GAME_ENGINE) { - ob = BKE_object_lod_matob_get(ob, scene_layer); + ob = BKE_object_lod_matob_get(ob, view_layer); } #else - UNUSED_VARS(scene_layer); + UNUSED_VARS(view_layer); #endif /* initialize state */ @@ -2029,7 +2029,7 @@ int GPU_default_lights(void) return count; } -int GPU_scene_object_lights(SceneLayer *scene_layer, float viewmat[4][4], int ortho) +int GPU_scene_object_lights(ViewLayer *view_layer, float viewmat[4][4], int ortho) { /* disable all lights */ for (int count = 0; count < 8; count++) @@ -2041,7 +2041,7 @@ int GPU_scene_object_lights(SceneLayer *scene_layer, float viewmat[4][4], int or int count = 0; - for (Base *base = FIRSTBASE(scene_layer); base; base = base->next) { + for (Base *base = FIRSTBASE(view_layer); base; base = base->next) { if (base->object->type != OB_LAMP) continue; diff --git a/source/blender/makesdna/DNA_fileglobal_types.h b/source/blender/makesdna/DNA_fileglobal_types.h index 6a01878a9ef..ed9640c365f 100644 --- a/source/blender/makesdna/DNA_fileglobal_types.h +++ b/source/blender/makesdna/DNA_fileglobal_types.h @@ -43,7 +43,7 @@ typedef struct FileGlobal { char pad[6]; struct bScreen *curscreen; struct Scene *curscene; - struct SceneLayer *cur_render_layer; + struct ViewLayer *cur_view_layer; void *pad1; int fileflags; diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h index d78a6af1d11..3eac7f0aab3 100644 --- a/source/blender/makesdna/DNA_layer_types.h +++ b/source/blender/makesdna/DNA_layer_types.h @@ -51,12 +51,12 @@ typedef struct CollectionOverride { /* TODO proper data */ } CollectionOverride; -typedef struct SceneLayerEngineData { - struct SceneLayerEngineData *next, *prev; +typedef struct ViewLayerEngineData { + struct ViewLayerEngineData *next, *prev; struct DrawEngineType *engine_type; void *storage; void (*free)(void *storage); -} SceneLayerEngineData; +} ViewLayerEngineData; typedef struct LayerCollection { struct LayerCollection *next, *prev; @@ -72,8 +72,8 @@ typedef struct LayerCollection { struct IDProperty *properties_evaluated; } LayerCollection; -typedef struct SceneLayer { - struct SceneLayer *next, *prev; +typedef struct ViewLayer { + struct ViewLayer *next, *prev; char name[64]; /* MAX_NAME */ short active_collection; short flag; @@ -96,8 +96,8 @@ typedef struct SceneLayer { struct FreestyleConfig freestyle_config; /* Runtime data */ - ListBase drawdata; /* SceneLayerEngineData */ -} SceneLayer; + ListBase drawdata; /* ViewLayerEngineData */ +} ViewLayer; typedef struct SceneCollection { struct SceneCollection *next, *prev; @@ -127,11 +127,11 @@ enum { COLLECTION_DISABLED = (1 << 2), }; -/* SceneLayer->flag */ +/* ViewLayer->flag */ enum { - SCENE_LAYER_RENDER = (1 << 0), - SCENE_LAYER_ENGINE_DIRTY = (1 << 1), - SCENE_LAYER_FREESTYLE = (1 << 2), + VIEW_LAYER_RENDER = (1 << 0), + VIEW_LAYER_ENGINE_DIRTY = (1 << 1), + VIEW_LAYER_FREESTYLE = (1 << 2), }; diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 9e42c0d0fc8..00e5e51e12d 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -174,22 +174,22 @@ typedef struct SceneRenderLayer { char name[64] DNA_DEPRECATED; /* MAX_NAME */ - struct Material *mat_override DNA_DEPRECATED; /* Converted to SceneLayer override. */ + struct Material *mat_override DNA_DEPRECATED; /* Converted to ViewLayer override. */ unsigned int lay DNA_DEPRECATED; /* Converted to LayerCollection cycles camera visibility override. */ unsigned int lay_zmask DNA_DEPRECATED; /* Converted to LayerCollection cycles holdout override. */ unsigned int lay_exclude DNA_DEPRECATED; - int layflag DNA_DEPRECATED; /* Converted to SceneLayer layflag and flag. */ + int layflag DNA_DEPRECATED; /* Converted to ViewLayer layflag and flag. */ int passflag DNA_DEPRECATED; /* pass_xor has to be after passflag */ - int pass_xor DNA_DEPRECATED; /* Converted to SceneLayer passflag and flag. */ + int pass_xor DNA_DEPRECATED; /* Converted to ViewLayer passflag and flag. */ - int samples DNA_DEPRECATED; /* Converted to SceneLayer override. */ - float pass_alpha_threshold DNA_DEPRECATED; /* Converted to SceneLayer pass_alpha_threshold. */ + int samples DNA_DEPRECATED; /* Converted to ViewLayer override. */ + float pass_alpha_threshold DNA_DEPRECATED; /* Converted to ViewLayer pass_alpha_threshold. */ - IDProperty *prop DNA_DEPRECATED; /* Converted to SceneLayer id_properties. */ + IDProperty *prop DNA_DEPRECATED; /* Converted to ViewLayer id_properties. */ - struct FreestyleConfig freestyleConfig DNA_DEPRECATED; /* Converted to SceneLayer freestyleConfig. */ + struct FreestyleConfig freestyleConfig DNA_DEPRECATED; /* Converted to ViewLayer freestyleConfig. */ } SceneRenderLayer; /* srl->layflag */ @@ -662,7 +662,7 @@ typedef struct RenderData { rcti disprect; /* information on different layers to be rendered */ - ListBase layers DNA_DEPRECATED; /* Converted to Scene->render_layers. */ + ListBase layers DNA_DEPRECATED; /* Converted to Scene->view_layers. */ short actlay DNA_DEPRECATED; /* Converted to Scene->active_layer. */ /* number of mblur samples */ @@ -1075,7 +1075,7 @@ typedef struct ParticleEditSettings { int draw_step, fade_frames; struct Scene *scene; - struct SceneLayer *scene_layer; + struct ViewLayer *view_layer; struct Object *object; struct Object *shape_object; } ParticleEditSettings; @@ -1688,9 +1688,9 @@ typedef struct Scene { struct PreviewImage *preview; - ListBase render_layers; + ListBase view_layers; struct SceneCollection *collection; - int active_layer; + int active_view_layer; int pad4; IDProperty *collection_properties; /* settings to be overriden by layer collections */ diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 8ce1410070f..34679e04f8d 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -180,7 +180,7 @@ typedef enum eSpaceButtons_Context { BCONTEXT_MODIFIER = 10, BCONTEXT_CONSTRAINT = 11, BCONTEXT_BONE_CONSTRAINT = 12, - BCONTEXT_RENDER_LAYER = 13, + BCONTEXT_VIEW_LAYER = 13, BCONTEXT_COLLECTION = 14, BCONTEXT_WORKSPACE = 15, diff --git a/source/blender/makesdna/DNA_workspace_types.h b/source/blender/makesdna/DNA_workspace_types.h index 1e650fcfb6d..f69f1b68930 100644 --- a/source/blender/makesdna/DNA_workspace_types.h +++ b/source/blender/makesdna/DNA_workspace_types.h @@ -94,7 +94,7 @@ typedef struct WorkSpace { /* should be: '#ifdef USE_WORKSPACE_TOOL'. */ bToolDef tool; - struct SceneLayer *render_layer DNA_PRIVATE_WORKSPACE; + struct ViewLayer *view_layer DNA_PRIVATE_WORKSPACE; struct ViewRender view_render; } WorkSpace; diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 181d01e04fc..c8312ce568b 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -311,10 +311,39 @@ BLI_INLINE const char *pad_up_4(const char *ptr) } /** + * Temporary DNA doversion for files that were created with Blender 2.80 + * between October 2016, and November 2017 (>=280.0 and < 280.2). + * + * /note This would be way more efficient if we can get the version from SDNA + * So we could return true if version == 280 && subversion < 2. + * + * Returns true if we need to do the DNA renaming. + */ +static bool need_doversion_280(SDNA *sdna, int *data, const bool data_alloc) +{ + if (data_alloc == false) { + return false; + } + + const char *cp = (char *)data; + for (int nr = 0; nr < sdna->nr_names; nr++) { + if (strcmp(cp, "*cur_render_layer") == 0) { + return true; + } + + while (*cp) cp++; + cp++; + } + + return false; +} + +/** * In sdna->data the data, now we convert that to something understandable */ static bool init_structDNA( SDNA *sdna, bool do_endian_swap, + bool data_alloc, const char **r_error_message) { int *data, *verg, gravity_fix = -1; @@ -359,6 +388,10 @@ static bool init_structDNA( *r_error_message = "NAME error in SDNA file"; return false; } + + /* Temporary DNA doversion for files that were created with Blender 2.80 + * between 280.0 and 280.2. */ + const bool doversion_280 = need_doversion_280(sdna, data, data_alloc); cp = (char *)data; for (int nr = 0; nr < sdna->nr_names; nr++) { @@ -373,6 +406,28 @@ static bool init_structDNA( gravity_fix = nr; } } + else if (doversion_280) { + if (strcmp(cp, "*render_layer") == 0) { + /* WorkSpace. */ + sdna->names[nr] = "*view_layer"; + } + else if (strcmp(cp, "*scene_layer") == 0) { + /* ParticleEditSettings. */ + sdna->names[nr] = "*view_layer"; + } + else if (strcmp(cp, "render_layers") == 0) { + /* Scene. */ + sdna->names[nr] = "view_layers"; + } + else if (strcmp(cp, "active_layer") == 0) { + /* Scene. */ + sdna->names[nr] = "active_view_layer"; + } + else if (strcmp(cp, "*cur_render_layer") == 0) { + /* FileGlobal. */ + sdna->names[nr] = "*cur_view_layer"; + } + } while (*cp) cp++; cp++; @@ -410,6 +465,14 @@ static bool init_structDNA( /* struct Screen was already used by X, 'bScreen' replaces the old IrisGL 'Screen' struct */ if (strcmp("bScreen", cp) == 0) sdna->types[nr] = cp + 1; } + else if (doversion_280) { + if (strcmp(cp, "SceneLayer") == 0) { + sdna->types[nr] = "ViewLayer"; + } + else if (strcmp(cp, "SceneLayerEngineData") == 0) { + sdna->types[nr] = "ViewLayerEngineData"; + } + } while (*cp) cp++; cp++; @@ -552,7 +615,7 @@ SDNA *DNA_sdna_from_data( sdna->data_alloc = data_alloc; - if (init_structDNA(sdna, do_endian_swap, &error_message)) { + if (init_structDNA(sdna, do_endian_swap, data_alloc, &error_message)) { return sdna; } else { diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index 7bb9e772697..ed1795fd39c 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -516,7 +516,6 @@ extern StructRNA RNA_RigidBodyJointConstraint; extern StructRNA RNA_SPHFluidSettings; extern StructRNA RNA_Scene; extern StructRNA RNA_SceneGameData; -extern StructRNA RNA_SceneLayer; extern StructRNA RNA_SceneRenderLayer; extern StructRNA RNA_SceneSequence; extern StructRNA RNA_SceneObjects; @@ -708,6 +707,7 @@ extern StructRNA RNA_WaveModifier; extern StructRNA RNA_VertexWeightEditModifier; extern StructRNA RNA_VertexWeightMixModifier; extern StructRNA RNA_VertexWeightProximityModifier; +extern StructRNA RNA_ViewLayer; extern StructRNA RNA_ViewRenderSettings; extern StructRNA RNA_Window; extern StructRNA RNA_WindowManager; diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 167e1776a57..657eeeeaeab 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -232,7 +232,7 @@ typedef enum PropertyFlag { PROP_IDPROPERTY = (1 << 10), /* This is an IDProperty, not a DNA one. */ PROP_DYNAMIC = (1 << 17), /* for dynamic arrays, and retvals of type string */ PROP_ENUM_NO_CONTEXT = (1 << 24), /* for enum that shouldn't be contextual */ - PROP_ENUM_NO_TRANSLATE = (1 << 29), /* for enums not to be translated (e.g. renderlayers' names in nodes) */ + PROP_ENUM_NO_TRANSLATE = (1 << 29), /* for enums not to be translated (e.g. viewlayers' names in nodes) */ } PropertyFlag; /* Function parameters flags. diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 6c6407789a0..8f07a6e22d9 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -3336,7 +3336,7 @@ static RNAProcessItem PROCESS_ITEMS[] = { {"rna_key.c", NULL, RNA_def_key}, {"rna_lamp.c", NULL, RNA_def_lamp}, {"rna_lattice.c", "rna_lattice_api.c", RNA_def_lattice}, - {"rna_layer.c", NULL, RNA_def_scene_layer}, + {"rna_layer.c", NULL, RNA_def_view_layer}, {"rna_linestyle.c", NULL, RNA_def_linestyle}, {"rna_main.c", "rna_main_api.c", RNA_def_main}, {"rna_material.c", "rna_material_api.c", RNA_def_material}, diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 52b70b151ab..3861f4d19b9 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -375,9 +375,9 @@ static void rna_Brush_main_tex_update(bContext *C, PointerRNA *ptr) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Brush *br = (Brush *)ptr->data; - BKE_paint_invalidate_overlay_tex(scene, scene_layer, br->mtex.tex); + BKE_paint_invalidate_overlay_tex(scene, view_layer, br->mtex.tex); rna_Brush_update(bmain, scene, ptr); } @@ -385,9 +385,9 @@ static void rna_Brush_secondary_tex_update(bContext *C, PointerRNA *ptr) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Brush *br = (Brush *)ptr->data; - BKE_paint_invalidate_overlay_tex(scene, scene_layer, br->mask_mtex.tex); + BKE_paint_invalidate_overlay_tex(scene, view_layer, br->mask_mtex.tex); rna_Brush_update(bmain, scene, ptr); } @@ -449,8 +449,8 @@ static void rna_TextureSlot_brush_angle_update(bContext *C, PointerRNA *ptr) MTex *mtex = ptr->data; /* skip invalidation of overlay for stencil mode */ if (mtex->mapping != MTEX_MAP_MODE_STENCIL) { - SceneLayer *scene_layer = CTX_data_scene_layer(C); - BKE_paint_invalidate_overlay_tex(scene, scene_layer, mtex->tex); + ViewLayer *view_layer = CTX_data_view_layer(C); + BKE_paint_invalidate_overlay_tex(scene, view_layer, mtex->tex); } rna_TextureSlot_update(C, ptr); diff --git a/source/blender/makesrna/intern/rna_context.c b/source/blender/makesrna/intern/rna_context.c index 39f050924f4..911f2cca2f6 100644 --- a/source/blender/makesrna/intern/rna_context.c +++ b/source/blender/makesrna/intern/rna_context.c @@ -129,10 +129,10 @@ static PointerRNA rna_Context_scene_get(PointerRNA *ptr) return rna_pointer_inherit_refine(ptr, &RNA_Scene, CTX_data_scene(C)); } -static PointerRNA rna_Context_scene_layer_get(PointerRNA *ptr) +static PointerRNA rna_Context_view_layer_get(PointerRNA *ptr) { bContext *C = (bContext *)ptr->data; - return rna_pointer_inherit_refine(ptr, &RNA_SceneLayer, CTX_data_scene_layer(C)); + return rna_pointer_inherit_refine(ptr, &RNA_ViewLayer, CTX_data_view_layer(C)); } static PointerRNA rna_Context_view_render_get(PointerRNA *ptr) @@ -280,10 +280,10 @@ void RNA_def_context(BlenderRNA *brna) RNA_def_property_struct_type(prop, "Scene"); RNA_def_property_pointer_funcs(prop, "rna_Context_scene_get", NULL, NULL, NULL); - prop = RNA_def_property(srna, "render_layer", PROP_POINTER, PROP_NONE); + prop = RNA_def_property(srna, "view_layer", PROP_POINTER, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_struct_type(prop, "SceneLayer"); - RNA_def_property_pointer_funcs(prop, "rna_Context_scene_layer_get", NULL, NULL, NULL); + RNA_def_property_struct_type(prop, "ViewLayer"); + RNA_def_property_pointer_funcs(prop, "rna_Context_view_layer_get", NULL, NULL, NULL); prop = RNA_def_property(srna, "view_render", PROP_POINTER, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index b0a2009e3b5..23a34918d33 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -43,7 +43,7 @@ struct Mesh; struct Object; struct ReportList; struct SDNA; -struct SceneLayer; +struct ViewLayer; /* Data structures used during define */ @@ -173,7 +173,7 @@ void RNA_def_render(struct BlenderRNA *brna); void RNA_def_rigidbody(struct BlenderRNA *brna); void RNA_def_rna(struct BlenderRNA *brna); void RNA_def_scene(struct BlenderRNA *brna); -void RNA_def_scene_layer(struct BlenderRNA *brna); +void RNA_def_view_layer(struct BlenderRNA *brna); void RNA_def_screen(struct BlenderRNA *brna); void RNA_def_sculpt_paint(struct BlenderRNA *brna); void RNA_def_sensor(struct BlenderRNA *brna); @@ -211,7 +211,7 @@ void rna_def_mtex_common(struct BlenderRNA *brna, struct StructRNA *srna, const const char *activeset, const char *activeeditable, const char *structname, const char *structname_slots, const char *update, const char *update_index); void rna_def_texpaint_slots(struct BlenderRNA *brna, struct StructRNA *srna); -void rna_def_render_layer_common(struct StructRNA *srna, int scene); +void rna_def_view_layer_common(struct StructRNA *srna, int scene); void rna_def_actionbone_group_common(struct StructRNA *srna, int update_flag, const char *update_cb); void rna_ActionGroup_colorset_set(struct PointerRNA *ptr, int value); @@ -240,7 +240,7 @@ void rna_object_vcollayer_name_set(struct PointerRNA *ptr, const char *value, ch PointerRNA rna_object_shapekey_index_get(struct ID *id, int value); int rna_object_shapekey_index_set(struct ID *id, PointerRNA value, int current); -/* SceneLayer related functions defined in rna_scene.c but required in rna_layer.c */ +/* ViewLayer related functions defined in rna_scene.c but required in rna_layer.c */ void rna_def_freestyle_settings(struct BlenderRNA *brna); struct PointerRNA rna_FreestyleLineSet_linestyle_get(struct PointerRNA *ptr); void rna_FreestyleLineSet_linestyle_set(struct PointerRNA *ptr, struct PointerRNA value); @@ -260,8 +260,8 @@ void rna_FreestyleSettings_module_remove( void rna_Scene_use_view_map_cache_update(struct Main *bmain, struct Scene *scene, struct PointerRNA *ptr); void rna_Scene_glsl_update(struct Main *bmain, struct Scene *scene, struct PointerRNA *ptr); void rna_Scene_freestyle_update(struct Main *bmain, struct Scene *scene, struct PointerRNA *ptr); -void rna_SceneLayer_name_set(struct PointerRNA *ptr, const char *value); -void rna_SceneLayer_pass_update(struct Main *bmain, struct Scene *activescene, struct PointerRNA *ptr); +void rna_ViewLayer_name_set(struct PointerRNA *ptr, const char *value); +void rna_ViewLayer_pass_update(struct Main *bmain, struct Scene *activescene, struct PointerRNA *ptr); /* named internal so as not to conflict with obj.update() rna func */ void rna_Object_internal_update_data(struct Main *bmain, struct Scene *scene, struct PointerRNA *ptr); @@ -436,7 +436,7 @@ PointerRNA rna_pointer_inherit_refine(struct PointerRNA *ptr, struct StructRNA * int rna_parameter_size(struct PropertyRNA *parm); struct Mesh *rna_Main_meshes_new_from_object( - struct Main *bmain, struct ReportList *reports, struct Scene *sce, struct SceneLayer *scene_layer, + struct Main *bmain, struct ReportList *reports, struct Scene *sce, struct ViewLayer *view_layer, struct Object *ob, int apply_modifiers, int settings, int calc_tessface, int calc_undeformed); /* XXX, these should not need to be defined here~! */ diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c index 8391048facf..81e10324241 100644 --- a/source/blender/makesrna/intern/rna_layer.c +++ b/source/blender/makesrna/intern/rna_layer.c @@ -317,7 +317,7 @@ static void rna_LayerEngineSettings_##_ENGINE_##_##_NAME_##_set(PointerRNA *ptr, /* clay engine */ #ifdef WITH_CLAY_ENGINE -/* SceneLayer settings. */ +/* ViewLayer settings. */ RNA_LAYER_ENGINE_CLAY_GET_SET_INT(ssao_samples) /* LayerCollection settings. */ @@ -334,7 +334,7 @@ RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(hair_brightness_randomness) #endif /* WITH_CLAY_ENGINE */ /* eevee engine */ -/* SceneLayer settings. */ +/* ViewLayer settings. */ RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(gtao_enable) RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(gtao_use_bent_normals) RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(gtao_denoise) @@ -409,7 +409,7 @@ RNA_LAYER_MODE_PAINT_VERTEX_GET_SET_BOOL(use_wire) #undef RNA_LAYER_ENGINE_GET_SET -static void rna_SceneLayerEngineSettings_update(bContext *C, PointerRNA *UNUSED(ptr)) +static void rna_ViewLayerEngineSettings_update(bContext *C, PointerRNA *UNUSED(ptr)) { Scene *scene = CTX_data_scene(C); /* TODO(sergey): Use proper flag for tagging here. */ @@ -426,8 +426,8 @@ static void rna_LayerCollectionEngineSettings_update(bContext *C, PointerRNA *UN static void rna_LayerCollectionEngineSettings_wire_update(bContext *C, PointerRNA *UNUSED(ptr)) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Object *ob = OBACT(scene_layer); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob = OBACT(view_layer); if (ob != NULL && ob->type == OB_MESH) { BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL); @@ -476,7 +476,7 @@ static void engine_settings_use(IDProperty *root, IDProperty *props, PointerRNA } } -static StructRNA *rna_SceneLayerSettings_refine(PointerRNA *ptr) +static StructRNA *rna_ViewLayerSettings_refine(PointerRNA *ptr) { IDProperty *props = (IDProperty *)ptr->data; BLI_assert(props && props->type == IDP_GROUP); @@ -485,11 +485,11 @@ static StructRNA *rna_SceneLayerSettings_refine(PointerRNA *ptr) case IDP_GROUP_SUB_ENGINE_RENDER: #ifdef WITH_CLAY_ENGINE if (STREQ(props->name, RE_engine_id_BLENDER_CLAY)) { - return &RNA_SceneLayerEngineSettingsClay; + return &RNA_ViewLayerEngineSettingsClay; } #endif if (STREQ(props->name, RE_engine_id_BLENDER_EEVEE)) { - return &RNA_SceneLayerEngineSettingsEevee; + return &RNA_ViewLayerEngineSettingsEevee; } break; case IDP_GROUP_SUB_MODE_OBJECT: @@ -501,29 +501,29 @@ static StructRNA *rna_SceneLayerSettings_refine(PointerRNA *ptr) break; } - return &RNA_SceneLayerSettings; + return &RNA_ViewLayerSettings; } -static void rna_SceneLayerSettings_name_get(PointerRNA *ptr, char *value) +static void rna_ViewLayerSettings_name_get(PointerRNA *ptr, char *value) { IDProperty *props = (IDProperty *)ptr->data; strcpy(value, props->name); } -static int rna_SceneLayerSettings_name_length(PointerRNA *ptr) +static int rna_ViewLayerSettings_name_length(PointerRNA *ptr) { IDProperty *props = (IDProperty *)ptr->data; return strnlen(props->name, sizeof(props->name)); } -static void rna_SceneLayerSettings_use(ID *id, IDProperty *props, const char *identifier) +static void rna_ViewLayerSettings_use(ID *id, IDProperty *props, const char *identifier) { Scene *scene = (Scene *)id; PointerRNA scene_props_ptr; IDProperty *scene_props; - scene_props = BKE_scene_layer_engine_scene_get(scene, COLLECTION_MODE_NONE, props->name); - RNA_pointer_create(id, &RNA_SceneLayerSettings, scene_props, &scene_props_ptr); + scene_props = BKE_view_layer_engine_scene_get(scene, COLLECTION_MODE_NONE, props->name); + RNA_pointer_create(id, &RNA_ViewLayerSettings, scene_props, &scene_props_ptr); engine_settings_use(props, scene_props, &scene_props_ptr, identifier); @@ -531,7 +531,7 @@ static void rna_SceneLayerSettings_use(ID *id, IDProperty *props, const char *id DEG_id_tag_update(id, 0); } -static void rna_SceneLayerSettings_unuse(ID *id, IDProperty *props, const char *identifier) +static void rna_ViewLayerSettings_unuse(ID *id, IDProperty *props, const char *identifier) { IDProperty *prop_to_remove = IDP_GetPropertyFromGroup(props, identifier); IDP_FreeFromGroup(props, prop_to_remove); @@ -692,11 +692,11 @@ static void rna_LayerCollection_enable_set( ID *id, LayerCollection *layer_collection, Main *bmain, bContext *C, ReportList *reports, int value) { Scene *scene = (Scene *)id; - SceneLayer *scene_layer = BKE_scene_layer_find_from_collection(scene, layer_collection); + ViewLayer *view_layer = BKE_view_layer_find_from_collection(scene, layer_collection); if (layer_collection->flag & COLLECTION_DISABLED) { if (value == 1) { - BKE_collection_enable(scene_layer, layer_collection); + BKE_collection_enable(view_layer, layer_collection); } else { BKE_reportf(reports, RPT_ERROR, "Layer collection '%s' is already disabled", @@ -706,7 +706,7 @@ static void rna_LayerCollection_enable_set( } else { if (value == 0) { - BKE_collection_disable(scene_layer, layer_collection); + BKE_collection_disable(view_layer, layer_collection); } else { BKE_reportf(reports, RPT_ERROR, "Layer collection '%s' is already enabled", @@ -723,45 +723,45 @@ static void rna_LayerCollection_enable_set( static int rna_LayerCollections_active_collection_index_get(PointerRNA *ptr) { - SceneLayer *scene_layer = (SceneLayer *)ptr->data; - return scene_layer->active_collection; + ViewLayer *view_layer = (ViewLayer *)ptr->data; + return view_layer->active_collection; } static void rna_LayerCollections_active_collection_index_set(PointerRNA *ptr, int value) { - SceneLayer *scene_layer = (SceneLayer *)ptr->data; - int num_collections = BKE_layer_collection_count(scene_layer); - scene_layer->active_collection = min_ff(value, num_collections - 1); + ViewLayer *view_layer = (ViewLayer *)ptr->data; + int num_collections = BKE_layer_collection_count(view_layer); + view_layer->active_collection = min_ff(value, num_collections - 1); } static void rna_LayerCollections_active_collection_index_range( PointerRNA *ptr, int *min, int *max, int *UNUSED(softmin), int *UNUSED(softmax)) { - SceneLayer *scene_layer = (SceneLayer *)ptr->data; + ViewLayer *view_layer = (ViewLayer *)ptr->data; *min = 0; - *max = max_ii(0, BKE_layer_collection_count(scene_layer) - 1); + *max = max_ii(0, BKE_layer_collection_count(view_layer) - 1); } static PointerRNA rna_LayerCollections_active_collection_get(PointerRNA *ptr) { - SceneLayer *scene_layer = (SceneLayer *)ptr->data; - LayerCollection *lc = BKE_layer_collection_get_active(scene_layer); + ViewLayer *view_layer = (ViewLayer *)ptr->data; + LayerCollection *lc = BKE_layer_collection_get_active(view_layer); return rna_pointer_inherit_refine(ptr, &RNA_LayerCollection, lc); } static void rna_LayerCollections_active_collection_set(PointerRNA *ptr, PointerRNA value) { - SceneLayer *scene_layer = (SceneLayer *)ptr->data; + ViewLayer *view_layer = (ViewLayer *)ptr->data; LayerCollection *lc = (LayerCollection *)value.data; - const int index = BKE_layer_collection_findindex(scene_layer, lc); - if (index != -1) scene_layer->active_collection = index; + const int index = BKE_layer_collection_findindex(view_layer, lc); + if (index != -1) view_layer->active_collection = index; } -LayerCollection * rna_SceneLayer_collection_link( - ID *id, SceneLayer *scene_layer, Main *bmain, SceneCollection *sc) +LayerCollection * rna_ViewLayer_collection_link( + ID *id, ViewLayer *view_layer, Main *bmain, SceneCollection *sc) { Scene *scene = (Scene *)id; - LayerCollection *lc = BKE_collection_link(scene_layer, sc); + LayerCollection *lc = BKE_collection_link(view_layer, sc); DEG_relations_tag_update(bmain); /* TODO(sergey): Use proper flag for tagging here. */ @@ -771,18 +771,18 @@ LayerCollection * rna_SceneLayer_collection_link( return lc; } -static void rna_SceneLayer_collection_unlink( - ID *id, SceneLayer *scene_layer, Main *bmain, ReportList *reports, LayerCollection *lc) +static void rna_ViewLayer_collection_unlink( + ID *id, ViewLayer *view_layer, Main *bmain, ReportList *reports, LayerCollection *lc) { Scene *scene = (Scene *)id; - if (BLI_findindex(&scene_layer->layer_collections, lc) == -1) { + if (BLI_findindex(&view_layer->layer_collections, lc) == -1) { BKE_reportf(reports, RPT_ERROR, "Layer collection '%s' is not in '%s'", - lc->scene_collection->name, scene_layer->name); + lc->scene_collection->name, view_layer->name); return; } - BKE_collection_unlink(scene_layer, lc); + BKE_collection_unlink(view_layer, lc); DEG_relations_tag_update(bmain); /* TODO(sergey): Use proper flag for tagging here. */ @@ -792,39 +792,39 @@ static void rna_SceneLayer_collection_unlink( static PointerRNA rna_LayerObjects_active_object_get(PointerRNA *ptr) { - SceneLayer *scene_layer = (SceneLayer *)ptr->data; - return rna_pointer_inherit_refine(ptr, &RNA_Object, scene_layer->basact ? scene_layer->basact->object : NULL); + ViewLayer *view_layer = (ViewLayer *)ptr->data; + return rna_pointer_inherit_refine(ptr, &RNA_Object, view_layer->basact ? view_layer->basact->object : NULL); } static void rna_LayerObjects_active_object_set(PointerRNA *ptr, PointerRNA value) { - SceneLayer *scene_layer = (SceneLayer *)ptr->data; + ViewLayer *view_layer = (ViewLayer *)ptr->data; if (value.data) - scene_layer->basact = BKE_scene_layer_base_find(scene_layer, (Object *)value.data); + view_layer->basact = BKE_view_layer_base_find(view_layer, (Object *)value.data); else - scene_layer->basact = NULL; + view_layer->basact = NULL; } -static IDProperty *rna_SceneLayer_idprops(PointerRNA *ptr, bool create) +static IDProperty *rna_ViewLayer_idprops(PointerRNA *ptr, bool create) { - SceneLayer *scene_layer = (SceneLayer *)ptr->data; + ViewLayer *view_layer = (ViewLayer *)ptr->data; - if (create && !scene_layer->id_properties) { + if (create && !view_layer->id_properties) { IDPropertyTemplate val = {0}; - scene_layer->id_properties = IDP_New(IDP_GROUP, &val, "SceneLayer ID properties"); + view_layer->id_properties = IDP_New(IDP_GROUP, &val, "ViewLayer ID properties"); } - return scene_layer->id_properties; + return view_layer->id_properties; } -static void rna_SceneLayer_update_render_passes(ID *id) +static void rna_ViewLayer_update_render_passes(ID *id) { Scene *scene = (Scene *)id; if (scene->nodetree) ntreeCompositUpdateRLayers(scene->nodetree); } -static PointerRNA rna_SceneLayer_objects_get(CollectionPropertyIterator *iter) +static PointerRNA rna_ViewLayer_objects_get(CollectionPropertyIterator *iter) { ListBaseIterator *internal = &iter->internal.listbase; @@ -833,7 +833,7 @@ static PointerRNA rna_SceneLayer_objects_get(CollectionPropertyIterator *iter) return rna_pointer_inherit_refine(&iter->parent, &RNA_Object, base->object); } -static int rna_SceneLayer_objects_selected_skip(CollectionPropertyIterator *iter, void *UNUSED(data)) +static int rna_ViewLayer_objects_selected_skip(CollectionPropertyIterator *iter, void *UNUSED(data)) { ListBaseIterator *internal = &iter->internal.listbase; Base *base = (Base *)internal->link; @@ -845,21 +845,21 @@ static int rna_SceneLayer_objects_selected_skip(CollectionPropertyIterator *iter return 1; }; -static PointerRNA rna_SceneLayer_depsgraph_get(PointerRNA *ptr) +static PointerRNA rna_ViewLayer_depsgraph_get(PointerRNA *ptr) { Scene *scene = (Scene *)ptr->id.data; - SceneLayer *scene_layer = (SceneLayer *)ptr->data; - Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, scene_layer, false); + ViewLayer *view_layer = (ViewLayer *)ptr->data; + Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, false); return rna_pointer_inherit_refine(ptr, &RNA_Depsgraph, depsgraph); } static void rna_LayerObjects_selected_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { - SceneLayer *scene_layer = (SceneLayer *)ptr->data; - rna_iterator_listbase_begin(iter, &scene_layer->object_bases, rna_SceneLayer_objects_selected_skip); + ViewLayer *view_layer = (ViewLayer *)ptr->data; + rna_iterator_listbase_begin(iter, &view_layer->object_bases, rna_ViewLayer_objects_selected_skip); } -static void rna_SceneLayer_update_tagged(SceneLayer *UNUSED(scene_layer), bContext *C) +static void rna_ViewLayer_update_tagged(ViewLayer *UNUSED(view_layer), bContext *C) { Depsgraph *graph = CTX_data_depsgraph(C); DEG_OBJECT_ITER(graph, ob, DEG_OBJECT_ITER_FLAG_ALL) @@ -1104,12 +1104,12 @@ static void rna_def_layer_collection_override(BlenderRNA *brna) #ifdef WITH_CLAY_ENGINE -static void rna_def_scene_layer_engine_settings_clay(BlenderRNA *brna) +static void rna_def_view_layer_engine_settings_clay(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; - srna = RNA_def_struct(brna, "SceneLayerEngineSettingsClay", "SceneLayerSettings"); + srna = RNA_def_struct(brna, "ViewLayerEngineSettingsClay", "ViewLayerSettings"); RNA_def_struct_ui_text(srna, "Clay Scene Layer Settings", "Clay Engine settings"); RNA_define_verify_sdna(0); /* not in sdna */ @@ -1121,13 +1121,13 @@ static void rna_def_scene_layer_engine_settings_clay(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Samples", "Number of samples"); RNA_def_property_range(prop, 1, 500); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); RNA_define_verify_sdna(1); /* not in sdna */ } #endif /* WITH_CLAY_ENGINE */ -static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) +static void rna_def_view_layer_engine_settings_eevee(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; @@ -1159,7 +1159,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) {0, NULL, 0, NULL, NULL} }; - srna = RNA_def_struct(brna, "SceneLayerEngineSettingsEevee", "SceneLayerSettings"); + srna = RNA_def_struct(brna, "ViewLayerEngineSettingsEevee", "ViewLayerSettings"); RNA_def_struct_ui_text(srna, "Eevee Scene Layer Settings", "Eevee Engine settings"); RNA_define_verify_sdna(0); /* not in sdna */ @@ -1174,14 +1174,14 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) "0 disable indirect diffuse light"); RNA_def_property_range(prop, 0, INT_MAX); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "gi_cubemap_resolution", PROP_ENUM, PROP_NONE); RNA_def_property_enum_funcs(prop, "rna_LayerEngineSettings_Eevee_gi_cubemap_resolution_get", "rna_LayerEngineSettings_Eevee_gi_cubemap_resolution_set", NULL); RNA_def_property_enum_items(prop, eevee_shadow_size_items); RNA_def_property_ui_text(prop, "Cubemap Size", "Size of every cubemaps"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); /* Temporal Anti-Aliasing (super sampling) */ prop = RNA_def_property(srna, "taa_samples", PROP_INT, PROP_NONE); @@ -1191,7 +1191,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) "disabled if 1"); RNA_def_property_range(prop, 0, INT_MAX); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); /* Screen Space Subsurface Scattering */ prop = RNA_def_property(srna, "sss_enable", PROP_BOOLEAN, PROP_NONE); @@ -1199,7 +1199,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) "rna_LayerEngineSettings_Eevee_sss_enable_set"); RNA_def_property_ui_text(prop, "Subsurface Scattering", "Enable screen space subsurface scattering"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "sss_samples", PROP_INT, PROP_NONE); RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Eevee_sss_samples_get", @@ -1207,7 +1207,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Samples", "Number of samples to compute the scattering effect"); RNA_def_property_range(prop, 1, 32); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "sss_jitter_threshold", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_sss_jitter_threshold_get", @@ -1215,7 +1215,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Jitter Threshold", "Rotate samples that are below this threshold"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); /* Screen Space Reflection */ prop = RNA_def_property(srna, "ssr_enable", PROP_BOOLEAN, PROP_NONE); @@ -1223,21 +1223,21 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) "rna_LayerEngineSettings_Eevee_ssr_enable_set"); RNA_def_property_ui_text(prop, "Screen Space Reflections", "Enable screen space reflection"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "ssr_refraction", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_refraction_get", "rna_LayerEngineSettings_Eevee_ssr_refraction_set"); RNA_def_property_ui_text(prop, "Screen Space Refractions", "Enable screen space Refractions"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "ssr_halfres", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_halfres_get", "rna_LayerEngineSettings_Eevee_ssr_halfres_set"); RNA_def_property_ui_text(prop, "Half Res Trace", "Raytrace at a lower resolution"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "ssr_quality", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_quality_get", @@ -1245,7 +1245,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Trace Quality", "Quality of the screen space raytracing"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "ssr_max_roughness", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_max_roughness_get", @@ -1253,7 +1253,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Max Roughness", "Do not raytrace reflections for roughness above this value"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "ssr_ray_count", PROP_INT, PROP_NONE); RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_ray_count_get", @@ -1261,7 +1261,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Samples", "Number of rays to trace per pixels"); RNA_def_property_range(prop, 1, 4); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "ssr_thickness", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_thickness_get", @@ -1270,7 +1270,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_range(prop, 1e-6f, FLT_MAX); RNA_def_property_ui_range(prop, 0.001f, FLT_MAX, 5, 3); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "ssr_border_fade", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_border_fade_get", @@ -1278,7 +1278,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Edge Fading", "Screen percentage used to fade the SSR"); RNA_def_property_range(prop, 0.0f, 0.5f); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "ssr_firefly_fac", PROP_FLOAT, PROP_NONE); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_ssr_firefly_fac_get", @@ -1286,7 +1286,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Clamp", "Clamp pixel intensity to remove noise (0 to disabled)"); RNA_def_property_range(prop, 0.0f, FLT_MAX); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); /* Volumetrics */ prop = RNA_def_property(srna, "volumetric_enable", PROP_BOOLEAN, PROP_NONE); @@ -1294,7 +1294,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) "rna_LayerEngineSettings_Eevee_volumetric_enable_set"); RNA_def_property_ui_text(prop, "Volumetrics", "Enable scattering and absorbance of volumetric material"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "volumetric_start", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_start_get", @@ -1303,7 +1303,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_range(prop, 1e-6f, FLT_MAX); RNA_def_property_ui_range(prop, 0.001f, FLT_MAX, 10, 3); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "volumetric_end", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_end_get", @@ -1312,7 +1312,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_range(prop, 1e-6f, FLT_MAX); RNA_def_property_ui_range(prop, 0.001f, FLT_MAX, 10, 3); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "volumetric_tile_size", PROP_ENUM, PROP_NONE); RNA_def_property_enum_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_tile_size_get", @@ -1321,7 +1321,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Tile Size", "Control the quality of the volumetric effects " "(lower size increase vram usage and quality)"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "volumetric_samples", PROP_INT, PROP_NONE); RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_samples_get", @@ -1329,21 +1329,21 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Samples", "Number of samples to compute volumetric effects"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); RNA_def_property_range(prop, 1, 256); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "volumetric_sample_distribution", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_sample_distribution_get", "rna_LayerEngineSettings_Eevee_volumetric_sample_distribution_set", NULL); RNA_def_property_ui_text(prop, "Exponential Sampling", "Distribute more samples closer to the camera"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "volumetric_lights", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_lights_get", "rna_LayerEngineSettings_Eevee_volumetric_lights_set"); RNA_def_property_ui_text(prop, "Volumetric Lighting", "Enable scene lamps interactions with volumetrics"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "volumetric_light_clamp", PROP_FLOAT, PROP_NONE); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_light_clamp_get", @@ -1351,14 +1351,14 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, FLT_MAX); RNA_def_property_ui_text(prop, "Clamp", "Maximum light contribution, reducing noise"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "volumetric_shadows", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_shadows_get", "rna_LayerEngineSettings_Eevee_volumetric_shadows_set"); RNA_def_property_ui_text(prop, "Volumetric Shadows", "Generate shadows from volumetric material (Very expensive)"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "volumetric_shadow_samples", PROP_INT, PROP_NONE); RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_shadow_samples_get", @@ -1366,14 +1366,14 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_range(prop, 1, 128); RNA_def_property_ui_text(prop, "Volumetric Shadow Samples", "Number of samples to compute volumetric shadowing"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "volumetric_colored_transmittance", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_volumetric_colored_transmittance_get", "rna_LayerEngineSettings_Eevee_volumetric_colored_transmittance_set"); RNA_def_property_ui_text(prop, "Colored Transmittance", "Enable wavelength dependent volumetric transmittance"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); /* Ambient Occlusion */ prop = RNA_def_property(srna, "gtao_enable", PROP_BOOLEAN, PROP_NONE); @@ -1381,21 +1381,21 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) "rna_LayerEngineSettings_Eevee_gtao_enable_set"); RNA_def_property_ui_text(prop, "Ambient Occlusion", "Enable ambient occlusion to simulate medium scale indirect shadowing"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "gtao_use_bent_normals", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_gtao_use_bent_normals_get", "rna_LayerEngineSettings_Eevee_gtao_use_bent_normals_set"); RNA_def_property_ui_text(prop, "Bent Normals", "Compute main non occluded direction to sample the environment"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "gtao_denoise", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_gtao_denoise_get", "rna_LayerEngineSettings_Eevee_gtao_denoise_set"); RNA_def_property_ui_text(prop, "Denoise", "Use denoising to filter the resulting occlusion and bent normal but exhibit 2x2 pixel blocks"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "gtao_bounce", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_gtao_bounce_get", @@ -1403,7 +1403,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Bounces Approximation", "An approximation to simulate light bounces " "giving less occlusion on brighter objects"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "gtao_factor", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_gtao_factor_get", "rna_LayerEngineSettings_Eevee_gtao_factor_set", NULL); @@ -1434,7 +1434,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Samples", "Number of samples to take to compute occlusion"); RNA_def_property_range(prop, 2, 32); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); /* Depth of Field */ prop = RNA_def_property(srna, "dof_enable", PROP_BOOLEAN, PROP_NONE); @@ -1442,7 +1442,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) "rna_LayerEngineSettings_Eevee_dof_enable_set"); RNA_def_property_ui_text(prop, "Depth of Field", "Enable depth of field using the values from the active camera"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "bokeh_max_size", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bokeh_max_size_get", @@ -1451,7 +1451,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, 2000.0f); RNA_def_property_ui_range(prop, 2.0f, 200.0f, 1, 3); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "bokeh_threshold", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bokeh_threshold_get", @@ -1460,7 +1460,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, 100000.0f); RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); /* Bloom */ prop = RNA_def_property(srna, "bloom_enable", PROP_BOOLEAN, PROP_NONE); @@ -1468,7 +1468,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) "rna_LayerEngineSettings_Eevee_bloom_enable_set"); RNA_def_property_ui_text(prop, "Bloom", "High brighness pixels generate a glowing effect"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "bloom_threshold", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bloom_threshold_get", @@ -1477,7 +1477,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, 100000.0f); RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "bloom_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_array(prop, 3); @@ -1485,7 +1485,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) "rna_LayerEngineSettings_Eevee_bloom_color_set", NULL); RNA_def_property_ui_text(prop, "Color", "Color applied to the bloom effect"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "bloom_knee", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bloom_knee_get", @@ -1493,7 +1493,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Knee", "Makes transition between under/over-threshold gradual"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "bloom_radius", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bloom_radius_get", @@ -1502,7 +1502,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, 100.0f); RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "bloom_clamp", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bloom_clamp_get", @@ -1511,7 +1511,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, 1000.0f); RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "bloom_intensity", PROP_FLOAT, PROP_UNSIGNED); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bloom_intensity_get", @@ -1520,7 +1520,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, 10000.0f); RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); /* Motion blur */ prop = RNA_def_property(srna, "motion_blur_enable", PROP_BOOLEAN, PROP_NONE); @@ -1528,7 +1528,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) "rna_LayerEngineSettings_Eevee_motion_blur_enable_set"); RNA_def_property_ui_text(prop, "Motion Blur", "Enable motion blur effect (only in camera view)"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "motion_blur_samples", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Eevee_motion_blur_samples_get", @@ -1536,7 +1536,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Samples", "Number of samples to take with motion blur"); RNA_def_property_range(prop, 1, 64); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "motion_blur_shutter", PROP_FLOAT, PROP_UNSIGNED); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_motion_blur_shutter_get", @@ -1544,7 +1544,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Shutter", "Time taken in frames between shutter open and close"); RNA_def_property_ui_range(prop, 0.01f, 2.0f, 1, 2); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); /* Shadows */ prop = RNA_def_property(srna, "shadow_method", PROP_ENUM, PROP_NONE); @@ -1552,20 +1552,20 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_enum_items(prop, eevee_shadow_method_items); RNA_def_property_ui_text(prop, "Method", "Technique use to compute the shadows"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "shadow_size", PROP_ENUM, PROP_NONE); RNA_def_property_enum_funcs(prop, "rna_LayerEngineSettings_Eevee_shadow_size_get", "rna_LayerEngineSettings_Eevee_shadow_size_set", NULL); RNA_def_property_enum_items(prop, eevee_shadow_size_items); RNA_def_property_ui_text(prop, "Size", "Size of every shadow maps"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); prop = RNA_def_property(srna, "shadow_high_bitdepth", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_shadow_high_bitdepth_get", "rna_LayerEngineSettings_Eevee_shadow_high_bitdepth_set"); RNA_def_property_ui_text(prop, "High Bitdepth", "Use 32bit shadows"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); RNA_define_verify_sdna(1); /* not in sdna */ } @@ -1823,49 +1823,49 @@ static void rna_def_layer_collection_mode_settings_paint_vertex(BlenderRNA *brna RNA_define_verify_sdna(1); /* not in sdna */ } -static void rna_def_scene_layer_settings(BlenderRNA *brna) +static void rna_def_view_layer_settings(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; FunctionRNA *func; PropertyRNA *parm; - srna = RNA_def_struct(brna, "SceneLayerSettings", NULL); + srna = RNA_def_struct(brna, "ViewLayerSettings", NULL); RNA_def_struct_sdna(srna, "IDProperty"); RNA_def_struct_ui_text(srna, "Scene Layer Settings", - "Engine specific settings that can be overriden by SceneLayer"); - RNA_def_struct_refine_func(srna, "rna_SceneLayerSettings_refine"); + "Engine specific settings that can be overriden by ViewLayer"); + RNA_def_struct_refine_func(srna, "rna_ViewLayerSettings_refine"); RNA_define_verify_sdna(0); prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); - RNA_def_property_string_funcs(prop, "rna_SceneLayerSettings_name_get", "rna_SceneLayerSettings_name_length", NULL); + RNA_def_property_string_funcs(prop, "rna_ViewLayerSettings_name_get", "rna_ViewLayerSettings_name_length", NULL); RNA_def_property_ui_text(prop, "Name", "Engine Name"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_struct_name_property(srna, prop); - func = RNA_def_function(srna, "use", "rna_SceneLayerSettings_use"); + func = RNA_def_function(srna, "use", "rna_ViewLayerSettings_use"); RNA_def_function_flag(func, FUNC_USE_SELF_ID); RNA_def_function_ui_description(func, "Initialize this property to use"); parm = RNA_def_string(func, "identifier", NULL, 0, "Property Name", "Name of the property to set"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - func = RNA_def_function(srna, "unuse", "rna_SceneLayerSettings_unuse"); + func = RNA_def_function(srna, "unuse", "rna_ViewLayerSettings_unuse"); RNA_def_function_flag(func, FUNC_USE_SELF_ID); RNA_def_function_ui_description(func, "Remove the property"); parm = RNA_def_string(func, "identifier", NULL, 0, "Property Name", "Name of the property to unset"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); #ifdef WITH_CLAY_ENGINE - rna_def_scene_layer_engine_settings_clay(brna); + rna_def_view_layer_engine_settings_clay(brna); #endif - rna_def_scene_layer_engine_settings_eevee(brna); + rna_def_view_layer_engine_settings_eevee(brna); #if 0 - rna_def_scene_layer_mode_settings_object(brna); - rna_def_scene_layer_mode_settings_edit(brna); - rna_def_scene_layer_mode_settings_paint_weight(brna); - rna_def_scene_layer_mode_settings_paint_vertex(brna); + rna_def_view_layer_mode_settings_object(brna); + rna_def_view_layer_mode_settings_edit(brna); + rna_def_view_layer_mode_settings_paint_weight(brna); + rna_def_view_layer_mode_settings_paint_vertex(brna); #endif RNA_define_verify_sdna(1); @@ -2020,7 +2020,7 @@ static void rna_def_layer_collections(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_srna(cprop, "LayerCollections"); srna = RNA_def_struct(brna, "LayerCollections", NULL); - RNA_def_struct_sdna(srna, "SceneLayer"); + RNA_def_struct_sdna(srna, "ViewLayer"); RNA_def_struct_ui_text(srna, "Layer Collections", "Collections of render layer"); prop = RNA_def_property(srna, "active_index", PROP_INT, PROP_UNSIGNED); @@ -2039,7 +2039,7 @@ static void rna_def_layer_collections(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_ui_text(prop, "Active Layer Collection", "Active Layer Collection"); RNA_def_property_update(prop, NC_SCENE | ND_LAYER, NULL); - func = RNA_def_function(srna, "link", "rna_SceneLayer_collection_link"); + func = RNA_def_function(srna, "link", "rna_ViewLayer_collection_link"); RNA_def_function_ui_description(func, "Link a collection to render layer"); RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN); parm = RNA_def_pointer(func, "scene_collection", "SceneCollection", "", "Collection to add to render layer"); @@ -2047,7 +2047,7 @@ static void rna_def_layer_collections(BlenderRNA *brna, PropertyRNA *cprop) parm = RNA_def_pointer(func, "result", "LayerCollection", "", "Newly created layer collection"); RNA_def_function_return(func, parm); - func = RNA_def_function(srna, "unlink", "rna_SceneLayer_collection_unlink"); + func = RNA_def_function(srna, "unlink", "rna_ViewLayer_collection_unlink"); RNA_def_function_ui_description(func, "Unlink a collection from render layer"); RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN | FUNC_USE_REPORTS); parm = RNA_def_pointer(func, "layer_collection", "LayerCollection", "", "Layer collection to remove from render layer"); @@ -2061,7 +2061,7 @@ static void rna_def_layer_objects(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_srna(cprop, "LayerObjects"); srna = RNA_def_struct(brna, "LayerObjects", NULL); - RNA_def_struct_sdna(srna, "SceneLayer"); + RNA_def_struct_sdna(srna, "ViewLayer"); RNA_def_struct_ui_text(srna, "Layer Objects", "Collections of objects"); prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE); @@ -2077,7 +2077,7 @@ static void rna_def_layer_objects(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_collection_sdna(prop, NULL, "object_bases", NULL); RNA_def_property_struct_type(prop, "Object"); RNA_def_property_collection_funcs(prop, "rna_LayerObjects_selected_begin", "rna_iterator_listbase_next", - "rna_iterator_listbase_end", "rna_SceneLayer_objects_get", + "rna_iterator_listbase_end", "rna_ViewLayer_objects_get", NULL, NULL, NULL, NULL); RNA_def_property_ui_text(prop, "Selected Objects", "All the selected objects of this layer"); } @@ -2147,20 +2147,20 @@ static void rna_def_scene_view_render(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Use Game Engine", "Current rendering engine is a game engine"); } -void RNA_def_scene_layer(BlenderRNA *brna) +void RNA_def_view_layer(BlenderRNA *brna) { FunctionRNA *func; StructRNA *srna; PropertyRNA *prop; - srna = RNA_def_struct(brna, "SceneLayer", NULL); + srna = RNA_def_struct(brna, "ViewLayer", NULL); RNA_def_struct_ui_text(srna, "Render Layer", "Render layer"); RNA_def_struct_ui_icon(srna, ICON_RENDERLAYERS); - RNA_def_struct_idprops_func(srna, "rna_SceneLayer_idprops"); + RNA_def_struct_idprops_func(srna, "rna_ViewLayer_idprops"); - rna_def_render_layer_common(srna, 1); + rna_def_view_layer_common(srna, 1); - func = RNA_def_function(srna, "update_render_passes", "rna_SceneLayer_update_render_passes"); + func = RNA_def_function(srna, "update_render_passes", "rna_ViewLayer_update_render_passes"); RNA_def_function_ui_description(func, "Requery the enabled render passes from the render engine"); RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_NO_SELF); @@ -2173,18 +2173,18 @@ void RNA_def_scene_layer(BlenderRNA *brna) prop = RNA_def_property(srna, "objects", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "object_bases", NULL); RNA_def_property_struct_type(prop, "Object"); - RNA_def_property_collection_funcs(prop, NULL, NULL, NULL, "rna_SceneLayer_objects_get", NULL, NULL, NULL, NULL); + RNA_def_property_collection_funcs(prop, NULL, NULL, NULL, "rna_ViewLayer_objects_get", NULL, NULL, NULL, NULL); RNA_def_property_ui_text(prop, "Objects", "All the objects in this layer"); rna_def_layer_objects(brna, prop); /* layer options */ prop = RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", SCENE_LAYER_RENDER); + RNA_def_property_boolean_sdna(prop, NULL, "flag", VIEW_LAYER_RENDER); RNA_def_property_ui_text(prop, "Enabled", "Disable or enable the render layer"); RNA_def_property_update(prop, NC_SCENE | ND_LAYER, NULL); prop = RNA_def_property(srna, "use_freestyle", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", SCENE_LAYER_FREESTYLE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", VIEW_LAYER_FREESTYLE); RNA_def_property_ui_text(prop, "Freestyle", "Render stylized strokes in this Layer"); RNA_def_property_update(prop, NC_SCENE | ND_LAYER, NULL); @@ -2200,11 +2200,11 @@ void RNA_def_scene_layer(BlenderRNA *brna) /* Override settings */ prop = RNA_def_property(srna, "engine_overrides", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "properties->data.group", NULL); - RNA_def_property_struct_type(prop, "SceneLayerSettings"); + RNA_def_property_struct_type(prop, "ViewLayerSettings"); RNA_def_property_ui_text(prop, "Layer Settings", "Override of engine specific render settings"); /* debug update routine */ - func = RNA_def_function(srna, "update", "rna_SceneLayer_update_tagged"); + func = RNA_def_function(srna, "update", "rna_ViewLayer_update_tagged"); RNA_def_function_flag(func, FUNC_USE_CONTEXT); RNA_def_function_ui_description(func, "Update data tagged to be updated from previous access to data or operators"); @@ -2213,7 +2213,7 @@ void RNA_def_scene_layer(BlenderRNA *brna) prop = RNA_def_property(srna, "depsgraph", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "Depsgraph"); RNA_def_property_ui_text(prop, "Dependency Graph", "Dependencies in the scene data"); - RNA_def_property_pointer_funcs(prop, "rna_SceneLayer_depsgraph_get", NULL, NULL, NULL); + RNA_def_property_pointer_funcs(prop, "rna_ViewLayer_depsgraph_get", NULL, NULL, NULL); /* Nested Data */ /* *** Non-Animated *** */ @@ -2224,7 +2224,7 @@ void RNA_def_scene_layer(BlenderRNA *brna) rna_def_object_base(brna); RNA_define_animate_sdna(true); /* *** Animated *** */ - rna_def_scene_layer_settings(brna); + rna_def_view_layer_settings(brna); rna_def_layer_collection_settings(brna); rna_def_scene_view_render(brna); } diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 698d67478d8..d1b28bffc7e 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -301,25 +301,25 @@ static Mesh *rna_Main_meshes_new(Main *bmain, const char *name) /* copied from Mesh_getFromObject and adapted to RNA interface */ /* settings: 1 - preview, 2 - render */ Mesh *rna_Main_meshes_new_from_object( - Main *bmain, ReportList *reports, Scene *sce, SceneLayer *scene_layer, + Main *bmain, ReportList *reports, Scene *sce, ViewLayer *view_layer, Object *ob, int apply_modifiers, int settings, int calc_tessface, int calc_undeformed) { EvaluationContext eval_ctx; /* XXX: This should never happen, but render pipeline is not ready to give - * proper scene_layer, and will always pass NULL here. For until we port - * pipeline form SceneRenderLayer to SceneLayer we have this stub to prevent + * proper view_layer, and will always pass NULL here. For until we port + * pipeline form SceneRenderLayer to ViewLayer we have this stub to prevent * some obvious crashes. * - sergey - */ - if (scene_layer == NULL) { - scene_layer = sce->render_layers.first; + if (view_layer == NULL) { + view_layer = sce->view_layers.first; } DEG_evaluation_context_init(&eval_ctx, settings); eval_ctx.ctime = (float)sce->r.cfra + sce->r.subframe; - eval_ctx.scene_layer = scene_layer; - eval_ctx.depsgraph = BKE_scene_get_depsgraph(sce, scene_layer, false); + eval_ctx.view_layer = view_layer; + eval_ctx.depsgraph = BKE_scene_get_depsgraph(sce, view_layer, false); switch (ob->type) { case OB_FONT: @@ -918,7 +918,7 @@ void RNA_def_main_meshes(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_function_flag(func, FUNC_USE_REPORTS); parm = RNA_def_pointer(func, "scene", "Scene", "", "Scene within which to evaluate modifiers"); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); - parm = RNA_def_pointer(func, "scene_layer", "SceneLayer", "", "Scene layer within which to evaluate modifiers"); + parm = RNA_def_pointer(func, "view_layer", "ViewLayer", "", "Scene layer within which to evaluate modifiers"); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); parm = RNA_def_pointer(func, "object", "Object", "", "Object to create mesh from"); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 8d44dc1d970..ab8370f77e7 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -2767,7 +2767,7 @@ static const EnumPropertyItem *rna_Node_image_view_itemf(bContext *UNUSED(C), Po return item; } -static const EnumPropertyItem *rna_Node_scene_layer_itemf(bContext *UNUSED(C), PointerRNA *ptr, +static const EnumPropertyItem *rna_Node_view_layer_itemf(bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { bNode *node = (bNode *)ptr->data; @@ -2780,7 +2780,7 @@ static const EnumPropertyItem *rna_Node_scene_layer_itemf(bContext *UNUSED(C), P return DummyRNA_NULL_items; } - rl = sce->render_layers.first; + rl = sce->view_layers.first; item = renderresult_layers_add_enum(rl); *r_free = true; @@ -2788,7 +2788,7 @@ static const EnumPropertyItem *rna_Node_scene_layer_itemf(bContext *UNUSED(C), P return item; } -static void rna_Node_scene_layer_update(Main *bmain, Scene *scene, PointerRNA *ptr) +static void rna_Node_view_layer_update(Main *bmain, Scene *scene, PointerRNA *ptr) { rna_Node_update(bmain, scene, ptr); if (scene->nodetree != NULL) { @@ -3129,7 +3129,7 @@ static int point_density_vertex_color_source_from_shader(NodeShaderTexPointDensi void rna_ShaderNodePointDensity_density_cache(bNode *self, Scene *scene, - SceneLayer *scene_layer, + ViewLayer *view_layer, int settings) { NodeShaderTexPointDensity *shader_point_density = self->storage; @@ -3167,13 +3167,13 @@ void rna_ShaderNodePointDensity_density_cache(bNode *self, /* Single-threaded sampling of the voxel domain. */ RE_point_density_cache(scene, - scene_layer, pd, + view_layer, pd, settings == 1); } void rna_ShaderNodePointDensity_density_calc(bNode *self, Scene *scene, - SceneLayer *scene_layer, + ViewLayer *view_layer, int settings, int *length, float **values) @@ -3195,7 +3195,7 @@ void rna_ShaderNodePointDensity_density_calc(bNode *self, } /* Single-threaded sampling of the voxel domain. */ - RE_point_density_sample(scene, scene_layer, pd, + RE_point_density_sample(scene, view_layer, pd, resolution, settings == 1, *values); @@ -3208,7 +3208,7 @@ void rna_ShaderNodePointDensity_density_calc(bNode *self, void rna_ShaderNodePointDensity_density_minmax(bNode *self, Scene *scene, - SceneLayer *scene_layer, + ViewLayer *view_layer, int settings, float r_min[3], float r_max[3]) @@ -3220,7 +3220,7 @@ void rna_ShaderNodePointDensity_density_minmax(bNode *self, zero_v3(r_max); return; } - RE_point_density_minmax(scene, scene_layer, pd, settings == 1, r_min, r_max); + RE_point_density_minmax(scene, view_layer, pd, settings == 1, r_min, r_max); } #else @@ -3235,7 +3235,7 @@ static const EnumPropertyItem prop_image_view_items[] = { {0, NULL, 0, NULL, NULL} }; -static const EnumPropertyItem prop_scene_layer_items[] = { +static const EnumPropertyItem prop_view_layer_items[] = { { 0, "PLACEHOLDER", 0, "Placeholder", ""}, {0, NULL, 0, NULL, NULL} }; @@ -4204,13 +4204,13 @@ static void def_sh_tex_pointdensity(StructRNA *srna) func = RNA_def_function(srna, "cache_point_density", "rna_ShaderNodePointDensity_density_cache"); RNA_def_function_ui_description(func, "Cache point density data for later calculation"); RNA_def_pointer(func, "scene", "Scene", "", ""); - RNA_def_pointer(func, "scene_layer", "SceneLayer", "", ""); + RNA_def_pointer(func, "view_layer", "ViewLayer", "", ""); RNA_def_enum(func, "settings", calc_mode_items, 1, "", "Calculate density for rendering"); func = RNA_def_function(srna, "calc_point_density", "rna_ShaderNodePointDensity_density_calc"); RNA_def_function_ui_description(func, "Calculate point density"); RNA_def_pointer(func, "scene", "Scene", "", ""); - RNA_def_pointer(func, "scene_layer", "SceneLayer", "", ""); + RNA_def_pointer(func, "view_layer", "ViewLayer", "", ""); RNA_def_enum(func, "settings", calc_mode_items, 1, "", "Calculate density for rendering"); /* TODO, See how array size of 0 works, this shouldnt be used. */ parm = RNA_def_float_array(func, "rgba_values", 1, NULL, 0, 0, "", "RGBA Values", 0, 0); @@ -4220,7 +4220,7 @@ static void def_sh_tex_pointdensity(StructRNA *srna) func = RNA_def_function(srna, "calc_point_density_minmax", "rna_ShaderNodePointDensity_density_minmax"); RNA_def_function_ui_description(func, "Calculate point density"); RNA_def_pointer(func, "scene", "Scene", "", ""); - RNA_def_pointer(func, "scene_layer", "SceneLayer", "", ""); + RNA_def_pointer(func, "view_layer", "ViewLayer", "", ""); RNA_def_enum(func, "settings", calc_mode_items, 1, "", "Calculate density for rendering"); parm = RNA_def_property(func, "min", PROP_FLOAT, PROP_COORDS); RNA_def_property_array(parm, 3); @@ -4857,15 +4857,15 @@ static void def_cmp_render_layers(StructRNA *srna) RNA_def_property_struct_type(prop, "Scene"); RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_REFCOUNT); RNA_def_property_ui_text(prop, "Scene", ""); - RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_scene_layer_update"); + RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_view_layer_update"); prop = RNA_def_property(srna, "layer", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "custom1"); - RNA_def_property_enum_items(prop, prop_scene_layer_items); - RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Node_scene_layer_itemf"); + RNA_def_property_enum_items(prop, prop_view_layer_items); + RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Node_view_layer_itemf"); RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE); RNA_def_property_ui_text(prop, "Layer", ""); - RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_scene_layer_update"); + RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_view_layer_update"); } static void rna_def_cmp_output_file_slot_file(BlenderRNA *brna) diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index ede9a2bdae7..74528a2c0e8 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -93,11 +93,11 @@ static const EnumPropertyItem space_items[] = { static void rna_Object_select_set(Object *ob, bContext *C, ReportList *reports, int action) { - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Base *base = BKE_scene_layer_base_find(scene_layer, ob); + ViewLayer *view_layer = CTX_data_view_layer(C); + Base *base = BKE_view_layer_base_find(view_layer, ob); if (!base) { - BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, scene_layer->name); + BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, view_layer->name); return; } @@ -116,18 +116,18 @@ static void rna_Object_select_set(Object *ob, bContext *C, ReportList *reports, break; case 0: /* SELECT */ default: - BKE_scene_layer_base_select(scene_layer, base); + BKE_view_layer_base_select(view_layer, base); break; } } static int rna_Object_select_get(Object *ob, bContext *C, ReportList *reports) { - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Base *base = BKE_scene_layer_base_find(scene_layer, ob); + ViewLayer *view_layer = CTX_data_view_layer(C); + Base *base = BKE_view_layer_base_find(view_layer, ob); if (!base) { - BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, scene_layer->name); + BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, view_layer->name); return -1; } @@ -136,11 +136,11 @@ static int rna_Object_select_get(Object *ob, bContext *C, ReportList *reports) static int rna_Object_visible_get(Object *ob, bContext *C, ReportList *reports) { - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Base *base = BKE_scene_layer_base_find(scene_layer, ob); + ViewLayer *view_layer = CTX_data_view_layer(C); + Base *base = BKE_view_layer_base_find(view_layer, ob); if (!base) { - BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, scene_layer->name); + BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, view_layer->name); return -1; } @@ -197,12 +197,12 @@ static void rna_Object_camera_fit_coords( /* copied from Mesh_getFromObject and adapted to RNA interface */ /* settings: 0 - preview, 1 - render */ static Mesh *rna_Object_to_mesh( - Object *ob, bContext *C, ReportList *reports, Scene *sce, SceneLayer *scene_layer, + Object *ob, bContext *C, ReportList *reports, Scene *sce, ViewLayer *view_layer, int apply_modifiers, int settings, int calc_tessface, int calc_undeformed) { Main *bmain = CTX_data_main(C); - return rna_Main_meshes_new_from_object(bmain, reports, sce, scene_layer, ob, apply_modifiers, settings, calc_tessface, calc_undeformed); + return rna_Main_meshes_new_from_object(bmain, reports, sce, view_layer, ob, apply_modifiers, settings, calc_tessface, calc_undeformed); } /* mostly a copy from convertblender.c */ @@ -640,7 +640,7 @@ void RNA_api_object(StructRNA *srna) RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_CONTEXT); parm = RNA_def_pointer(func, "scene", "Scene", "", "Scene within which to evaluate modifiers"); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); - parm = RNA_def_pointer(func, "scene_layer", "SceneLayer", "", "Scene layer within which to evaluate modifiers"); + parm = RNA_def_pointer(func, "view_layer", "ViewLayer", "", "Scene layer within which to evaluate modifiers"); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); parm = RNA_def_boolean(func, "apply_modifiers", 0, "", "Apply modifiers"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 4f8f6c55d55..031b0bdec99 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -1686,7 +1686,7 @@ static void rna_def_softbody(BlenderRNA *brna) prop = RNA_def_property(srna, "spring_length", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "springpreload"); RNA_def_property_range(prop, 0.0f, 200.0f); - RNA_def_property_ui_text(prop, "scene_layer", "Alter spring length to shrink/blow up (unit %) 0 to disable"); + RNA_def_property_ui_text(prop, "view_layer", "Alter spring length to shrink/blow up (unit %) 0 to disable"); RNA_def_property_update(prop, 0, "rna_softbody_update"); prop = RNA_def_property(srna, "aero", PROP_INT, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 0c85799fce7..67eaa22fbe4 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -614,13 +614,13 @@ static void rna_ParticleSystem_mcol_on_emitter(ParticleSystem *particlesystem, R } } -static void rna_ParticleSystem_set_resolution(ParticleSystem *particlesystem, Scene *scene, SceneLayer *scene_layer, Object *object, int resolution) +static void rna_ParticleSystem_set_resolution(ParticleSystem *particlesystem, Scene *scene, ViewLayer *view_layer, Object *object, int resolution) { EvaluationContext eval_ctx; DEG_evaluation_context_init(&eval_ctx, resolution); eval_ctx.ctime = (float)scene->r.cfra + scene->r.subframe; - eval_ctx.scene_layer = scene_layer; + eval_ctx.view_layer = view_layer; if (resolution == eModifierMode_Render) { ParticleSystemModifierData *psmd = psys_get_modifier(object, particlesystem); @@ -3557,7 +3557,7 @@ static void rna_def_particle_system(BlenderRNA *brna) func = RNA_def_function(srna, "set_resolution", "rna_ParticleSystem_set_resolution"); RNA_def_function_ui_description(func, "Set the resolution to use for the number of particles"); RNA_def_pointer(func, "scene", "Scene", "", "Scene"); - RNA_def_pointer(func, "scene_layer", "SceneLayer", "", "SceneLayer"); + RNA_def_pointer(func, "view_layer", "ViewLayer", "", "ViewLayer"); RNA_def_pointer(func, "object", "Object", "", "Object"); RNA_def_enum(func, "resolution", resolution_items, 0, "", "Resolution settings to apply"); diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index 169210d7026..15487082217 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -280,7 +280,7 @@ static void engine_collection_settings_create(RenderEngine *engine, struct IDPro RNA_parameter_list_free(&list); } -static void engine_update_render_passes(RenderEngine *engine, struct Scene *scene, struct SceneLayer *scene_layer) +static void engine_update_render_passes(RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer) { extern FunctionRNA rna_RenderEngine_update_render_passes_func; PointerRNA ptr; @@ -292,7 +292,7 @@ static void engine_update_render_passes(RenderEngine *engine, struct Scene *scen RNA_parameter_list_create(&list, &ptr, func); RNA_parameter_set_lookup(&list, "scene", &scene); - RNA_parameter_set_lookup(&list, "renderlayer", &scene_layer); + RNA_parameter_set_lookup(&list, "renderlayer", &view_layer); engine->type->ext.call(NULL, &ptr, func, &list); RNA_parameter_list_free(&list); @@ -398,14 +398,14 @@ static PointerRNA rna_RenderEngine_render_get(PointerRNA *ptr) } } -static PointerRNA rna_RenderEngine_scene_layer_get(PointerRNA *ptr) +static PointerRNA rna_RenderEngine_view_layer_get(PointerRNA *ptr) { RenderEngine *engine = (RenderEngine *)ptr->data; if (engine->re != NULL) { - SceneLayer *scene_layer = RE_engine_get_scene_layer(engine->re); - return rna_pointer_inherit_refine(ptr, &RNA_SceneLayer, scene_layer); + ViewLayer *view_layer = RE_engine_get_view_layer(engine->re); + return rna_pointer_inherit_refine(ptr, &RNA_ViewLayer, view_layer); } - return rna_pointer_inherit_refine(ptr, &RNA_SceneLayer, NULL); + return rna_pointer_inherit_refine(ptr, &RNA_ViewLayer, NULL); } static PointerRNA rna_RenderEngine_camera_override_get(PointerRNA *ptr) @@ -565,7 +565,7 @@ static void rna_def_render_engine(BlenderRNA *brna) RNA_def_function_ui_description(func, "Update the render passes that will be generated"); RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL | FUNC_ALLOW_WRITE); parm = RNA_def_pointer(func, "scene", "Scene", "", ""); - parm = RNA_def_pointer(func, "renderlayer", "SceneLayer", "", ""); + parm = RNA_def_pointer(func, "renderlayer", "ViewLayer", "", ""); /* per-collection engine settings initialization */ func = RNA_def_function(srna, "collection_settings_create", NULL); @@ -758,7 +758,7 @@ static void rna_def_render_engine(BlenderRNA *brna) RNA_def_function_ui_description(func, "Register a render pass that will be part of the render with the current settings"); prop = RNA_def_pointer(func, "scene", "Scene", "", ""); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - prop = RNA_def_pointer(func, "scene_layer", "SceneLayer", "", ""); + prop = RNA_def_pointer(func, "view_layer", "ViewLayer", "", ""); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); prop = RNA_def_string(func, "name", NULL, MAX_NAME, "Name", ""); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); @@ -769,9 +769,9 @@ static void rna_def_render_engine(BlenderRNA *brna) prop = RNA_def_enum(func, "type", render_pass_type_items, SOCK_FLOAT, "Type", ""); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - prop = RNA_def_property(srna, "scene_layer", PROP_POINTER, PROP_NONE); - RNA_def_property_struct_type(prop, "SceneLayer"); - RNA_def_property_pointer_funcs(prop, "rna_RenderEngine_scene_layer_get", NULL, NULL, NULL); + prop = RNA_def_property(srna, "view_layer", PROP_POINTER, PROP_NONE); + RNA_def_property_struct_type(prop, "ViewLayer"); + RNA_def_property_pointer_funcs(prop, "rna_RenderEngine_view_layer_get", NULL, NULL, NULL); RNA_def_property_ui_text(prop, "Scene layer", ""); /* registration */ @@ -944,7 +944,7 @@ static void rna_def_render_layer(BlenderRNA *brna) RNA_define_verify_sdna(0); - rna_def_render_layer_common(srna, 0); + rna_def_view_layer_common(srna, 0); prop = RNA_def_property(srna, "passes", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, "RenderPass"); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index bfddeb53996..d2a7bd65d4a 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -682,7 +682,7 @@ static void rna_Scene_layer_set(PointerRNA *ptr, const int *values) { Scene *scene = (Scene *)ptr->data; - scene->lay = ED_view3d_scene_layer_set(scene->lay, values, &scene->layact); + scene->lay = ED_view3d_view_layer_set(scene->lay, values, &scene->layact); } static int rna_Scene_active_layer_get(PointerRNA *ptr) @@ -1393,31 +1393,31 @@ void rna_Scene_use_view_map_cache_update(Main *UNUSED(bmain), Scene *UNUSED(scen #endif } -void rna_SceneLayer_name_set(PointerRNA *ptr, const char *value) +void rna_ViewLayer_name_set(PointerRNA *ptr, const char *value) { Scene *scene = (Scene *)ptr->id.data; - SceneLayer *scene_layer = (SceneLayer *)ptr->data; - char oldname[sizeof(scene_layer->name)]; + ViewLayer *view_layer = (ViewLayer *)ptr->data; + char oldname[sizeof(view_layer->name)]; - BLI_strncpy(oldname, scene_layer->name, sizeof(scene_layer->name)); + BLI_strncpy(oldname, view_layer->name, sizeof(view_layer->name)); - BLI_strncpy_utf8(scene_layer->name, value, sizeof(scene_layer->name)); - BLI_uniquename(&scene->render_layers, scene_layer, DATA_("RenderLayer"), '.', offsetof(SceneLayer, name), sizeof(scene_layer->name)); + BLI_strncpy_utf8(view_layer->name, value, sizeof(view_layer->name)); + BLI_uniquename(&scene->view_layers, view_layer, DATA_("ViewLayer"), '.', offsetof(ViewLayer, name), sizeof(view_layer->name)); if (scene->nodetree) { bNode *node; - int index = BLI_findindex(&scene->render_layers, scene_layer); + int index = BLI_findindex(&scene->view_layers, view_layer); for (node = scene->nodetree->nodes.first; node; node = node->next) { if (node->type == CMP_NODE_R_LAYERS && node->id == NULL) { if (node->custom1 == index) - BLI_strncpy(node->name, scene_layer->name, NODE_MAXSTR); + BLI_strncpy(node->name, view_layer->name, NODE_MAXSTR); } } } /* fix all the animation data which may link to this */ - BKE_animdata_fix_paths_rename_all(NULL, "render.layers", oldname, scene_layer->name); + BKE_animdata_fix_paths_rename_all(NULL, "view_layers", oldname, view_layer->name); } static void rna_SceneRenderView_name_set(PointerRNA *ptr, const char *value) @@ -1428,7 +1428,7 @@ static void rna_SceneRenderView_name_set(PointerRNA *ptr, const char *value) BLI_uniquename(&scene->r.views, rv, DATA_("RenderView"), '.', offsetof(SceneRenderView, name), sizeof(rv->name)); } -void rna_SceneLayer_pass_update(Main *bmain, Scene *activescene, PointerRNA *ptr) +void rna_ViewLayer_pass_update(Main *bmain, Scene *activescene, PointerRNA *ptr) { Scene *scene = (Scene *)ptr->id.data; @@ -1465,15 +1465,15 @@ static void rna_Physics_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Pointe static void rna_Scene_editmesh_select_mode_set(PointerRNA *ptr, const int *value) { Scene *scene = (Scene *)ptr->id.data; - SceneLayer *scene_layer = BKE_scene_layer_context_active_PLACEHOLDER(scene); + ViewLayer *view_layer = BKE_view_layer_context_active_PLACEHOLDER(scene); ToolSettings *ts = (ToolSettings *)ptr->data; int flag = (value[0] ? SCE_SELECT_VERTEX : 0) | (value[1] ? SCE_SELECT_EDGE : 0) | (value[2] ? SCE_SELECT_FACE : 0); if (flag) { ts->selectmode = flag; - if (scene_layer->basact) { - Mesh *me = BKE_mesh_from_object(scene_layer->basact->object); + if (view_layer->basact) { + Mesh *me = BKE_mesh_from_object(view_layer->basact->object); if (me && me->edit_btmesh && me->edit_btmesh->selectmode != flag) { me->edit_btmesh->selectmode = flag; EDBM_selectmode_set(me->edit_btmesh); @@ -1484,11 +1484,11 @@ static void rna_Scene_editmesh_select_mode_set(PointerRNA *ptr, const int *value static void rna_Scene_editmesh_select_mode_update(Main *UNUSED(bmain), bContext *C, Scene *UNUSED(scene), PointerRNA *UNUSED(ptr)) { - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Mesh *me = NULL; - if (scene_layer->basact) { - me = BKE_mesh_from_object(scene_layer->basact->object); + if (view_layer->basact) { + me = BKE_mesh_from_object(view_layer->basact->object); if (me && me->edit_btmesh == NULL) me = NULL; } @@ -1690,8 +1690,8 @@ static KeyingSet *rna_Scene_keying_set_new(Scene *sce, ReportList *reports, cons static void rna_UnifiedPaintSettings_update(bContext *C, PointerRNA *UNUSED(ptr)) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Brush *br = BKE_paint_brush(BKE_paint_get_active(scene, scene_layer)); + ViewLayer *view_layer = CTX_data_view_layer(C); + Brush *br = BKE_paint_brush(BKE_paint_get_active(scene, view_layer)); WM_main_add_notifier(NC_BRUSH | NA_EDITED, br); } @@ -1734,11 +1734,11 @@ static char *rna_CurvePaintSettings_path(PointerRNA *UNUSED(ptr)) /* generic function to recalc geometry */ static void rna_EditMesh_update(Main *UNUSED(bmain), bContext *C, Scene *UNUSED(scene), PointerRNA *UNUSED(ptr)) { - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Mesh *me = NULL; - if (scene_layer->basact) { - me = BKE_mesh_from_object(scene_layer->basact->object); + if (view_layer->basact) { + me = BKE_mesh_from_object(view_layer->basact->object); if (me && me->edit_btmesh == NULL) me = NULL; } @@ -1761,8 +1761,8 @@ static char *rna_MeshStatVis_path(PointerRNA *UNUSED(ptr)) * given its own notifier. */ static void rna_Scene_update_active_object_data(bContext *C, PointerRNA *UNUSED(ptr)) { - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Object *ob = OBACT(scene_layer); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob = OBACT(view_layer); if (ob) { DEG_id_tag_update(&ob->id, OB_RECALC_DATA); @@ -1955,64 +1955,64 @@ static int rna_gpu_is_hq_supported_get(PointerRNA *UNUSED(ptr)) return true; } -static int rna_SceneLayer_active_layer_index_get(PointerRNA *ptr) +static int rna_ViewLayer_active_view_layer_index_get(PointerRNA *ptr) { Scene *scene = (Scene *)ptr->data; - return scene->active_layer; + return scene->active_view_layer; } -static void rna_SceneLayer_active_layer_index_set(PointerRNA *ptr, int value) +static void rna_ViewLayer_active_view_layer_index_set(PointerRNA *ptr, int value) { Scene *scene = (Scene *)ptr->data; - int num_layers = BLI_listbase_count(&scene->render_layers); - scene->active_layer = min_ff(value, num_layers - 1); + int num_layers = BLI_listbase_count(&scene->view_layers); + scene->active_view_layer = min_ff(value, num_layers - 1); } -static void rna_SceneLayer_active_layer_index_range( +static void rna_ViewLayer_active_view_layer_index_range( PointerRNA *ptr, int *min, int *max, int *UNUSED(softmin), int *UNUSED(softmax)) { Scene *scene = (Scene *)ptr->data; *min = 0; - *max = max_ii(0, BLI_listbase_count(&scene->render_layers) - 1); + *max = max_ii(0, BLI_listbase_count(&scene->view_layers) - 1); } -static PointerRNA rna_SceneLayer_active_layer_get(PointerRNA *ptr) +static PointerRNA rna_ViewLayer_active_view_layer_get(PointerRNA *ptr) { Scene *scene = (Scene *)ptr->data; - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); - return rna_pointer_inherit_refine(ptr, &RNA_SceneLayer, scene_layer); + return rna_pointer_inherit_refine(ptr, &RNA_ViewLayer, view_layer); } -static void rna_SceneLayer_active_layer_set(PointerRNA *ptr, PointerRNA value) +static void rna_ViewLayer_active_view_layer_set(PointerRNA *ptr, PointerRNA value) { Scene *scene = (Scene *)ptr->data; - SceneLayer *scene_layer = (SceneLayer *)value.data; - const int index = BLI_findindex(&scene->render_layers, scene_layer); - if (index != -1) scene->active_layer = index; + ViewLayer *view_layer = (ViewLayer *)value.data; + const int index = BLI_findindex(&scene->view_layers, view_layer); + if (index != -1) scene->active_view_layer = index; } -static SceneLayer *rna_SceneLayer_new( +static ViewLayer *rna_ViewLayer_new( ID *id, Scene *UNUSED(sce), Main *bmain, const char *name) { Scene *scene = (Scene *)id; - SceneLayer *scene_layer = BKE_scene_layer_add(scene, name); + ViewLayer *view_layer = BKE_view_layer_add(scene, name); DEG_id_tag_update(&scene->id, 0); DEG_relations_tag_update(bmain); WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL); - return scene_layer; + return view_layer; } -static void rna_SceneLayer_remove( +static void rna_ViewLayer_remove( ID *id, Scene *UNUSED(sce), Main *bmain, ReportList *reports, PointerRNA *sl_ptr) { Scene *scene = (Scene *)id; - SceneLayer *scene_layer = sl_ptr->data; + ViewLayer *view_layer = sl_ptr->data; - if (ED_scene_render_layer_delete(bmain, scene, scene_layer, reports)) { + if (ED_scene_view_layer_delete(bmain, scene, view_layer, reports)) { RNA_POINTER_INVALIDATE(sl_ptr); } } @@ -3168,12 +3168,12 @@ static void rna_def_unit_settings(BlenderRNA *brna) RNA_def_property_update(prop, NC_WINDOW, NULL); } -void rna_def_render_layer_common(StructRNA *srna, int scene) +void rna_def_view_layer_common(StructRNA *srna, int scene) { PropertyRNA *prop; prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); - if (scene) RNA_def_property_string_funcs(prop, NULL, NULL, "rna_SceneLayer_name_set"); + if (scene) RNA_def_property_string_funcs(prop, NULL, NULL, "rna_ViewLayer_name_set"); else RNA_def_property_string_sdna(prop, NULL, "name"); RNA_def_property_ui_text(prop, "Name", "Render layer name"); RNA_def_struct_name_property(srna, prop); @@ -3254,237 +3254,237 @@ void rna_def_render_layer_common(StructRNA *srna, int scene) prop = RNA_def_property(srna, "use_pass_combined", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_COMBINED); RNA_def_property_ui_text(prop, "Combined", "Deliver full combined RGBA buffer"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_Z); RNA_def_property_ui_text(prop, "Z", "Deliver Z values pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_vector", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_VECTOR); RNA_def_property_ui_text(prop, "Vector", "Deliver speed vector pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_normal", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_NORMAL); RNA_def_property_ui_text(prop, "Normal", "Deliver normal pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_uv", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_UV); RNA_def_property_ui_text(prop, "UV", "Deliver texture UV pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_mist", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_MIST); RNA_def_property_ui_text(prop, "Mist", "Deliver mist factor pass (0.0-1.0)"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_object_index", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_INDEXOB); RNA_def_property_ui_text(prop, "Object Index", "Deliver object index pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_material_index", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_INDEXMA); RNA_def_property_ui_text(prop, "Material Index", "Deliver material index pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_RGBA); RNA_def_property_ui_text(prop, "Color", "Deliver shade-less color pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_diffuse", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_DIFFUSE); RNA_def_property_ui_text(prop, "Diffuse", "Deliver diffuse pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_specular", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_SPEC); RNA_def_property_ui_text(prop, "Specular", "Deliver specular pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_shadow", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_SHADOW); RNA_def_property_ui_text(prop, "Shadow", "Deliver shadow pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_ambient_occlusion", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_AO); RNA_def_property_ui_text(prop, "AO", "Deliver AO pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_reflection", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_REFLECT); RNA_def_property_ui_text(prop, "Reflection", "Deliver raytraced reflection pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_refraction", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_REFRACT); RNA_def_property_ui_text(prop, "Refraction", "Deliver raytraced refraction pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_emit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_EMIT); RNA_def_property_ui_text(prop, "Emit", "Deliver emission pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_environment", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_ENVIRONMENT); RNA_def_property_ui_text(prop, "Environment", "Deliver environment lighting pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_indirect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_INDIRECT); RNA_def_property_ui_text(prop, "Indirect", "Deliver indirect lighting pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "exclude_specular", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_SPEC); RNA_def_property_ui_text(prop, "Specular Exclude", "Exclude specular pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "exclude_shadow", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_SHADOW); RNA_def_property_ui_text(prop, "Shadow Exclude", "Exclude shadow pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "exclude_ambient_occlusion", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_AO); RNA_def_property_ui_text(prop, "AO Exclude", "Exclude AO pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "exclude_reflection", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_REFLECT); RNA_def_property_ui_text(prop, "Reflection Exclude", "Exclude raytraced reflection pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "exclude_refraction", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_REFRACT); RNA_def_property_ui_text(prop, "Refraction Exclude", "Exclude raytraced refraction pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "exclude_emit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_EMIT); RNA_def_property_ui_text(prop, "Emit Exclude", "Exclude emission pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "exclude_environment", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_ENVIRONMENT); RNA_def_property_ui_text(prop, "Environment Exclude", "Exclude environment pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "exclude_indirect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_INDIRECT); RNA_def_property_ui_text(prop, "Indirect Exclude", "Exclude indirect pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_diffuse_direct", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_DIFFUSE_DIRECT); RNA_def_property_ui_text(prop, "Diffuse Direct", "Deliver diffuse direct pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_diffuse_indirect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_DIFFUSE_INDIRECT); RNA_def_property_ui_text(prop, "Diffuse Indirect", "Deliver diffuse indirect pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_diffuse_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_DIFFUSE_COLOR); RNA_def_property_ui_text(prop, "Diffuse Color", "Deliver diffuse color pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_glossy_direct", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_GLOSSY_DIRECT); RNA_def_property_ui_text(prop, "Glossy Direct", "Deliver glossy direct pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_glossy_indirect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_GLOSSY_INDIRECT); RNA_def_property_ui_text(prop, "Glossy Indirect", "Deliver glossy indirect pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_glossy_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_GLOSSY_COLOR); RNA_def_property_ui_text(prop, "Glossy Color", "Deliver glossy color pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_transmission_direct", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_TRANSM_DIRECT); RNA_def_property_ui_text(prop, "Transmission Direct", "Deliver transmission direct pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_transmission_indirect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_TRANSM_INDIRECT); RNA_def_property_ui_text(prop, "Transmission Indirect", "Deliver transmission indirect pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_transmission_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_TRANSM_COLOR); RNA_def_property_ui_text(prop, "Transmission Color", "Deliver transmission color pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_subsurface_direct", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_SUBSURFACE_DIRECT); RNA_def_property_ui_text(prop, "Subsurface Direct", "Deliver subsurface direct pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_subsurface_indirect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_SUBSURFACE_INDIRECT); RNA_def_property_ui_text(prop, "Subsurface Indirect", "Deliver subsurface indirect pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_subsurface_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_SUBSURFACE_COLOR); RNA_def_property_ui_text(prop, "Subsurface Color", "Deliver subsurface color pass"); - if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneLayer_pass_update"); + if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_ViewLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); } @@ -3847,8 +3847,8 @@ void rna_def_freestyle_settings(BlenderRNA *brna) srna = RNA_def_struct(brna, "FreestyleSettings", NULL); RNA_def_struct_sdna(srna, "FreestyleConfig"); - RNA_def_struct_nested(brna, srna, "SceneLayer"); - RNA_def_struct_ui_text(srna, "Freestyle Settings", "Freestyle settings for a SceneLayer data-block"); + RNA_def_struct_nested(brna, srna, "ViewLayer"); + RNA_def_struct_ui_text(srna, "Freestyle Settings", "Freestyle settings for a ViewLayer data-block"); prop = RNA_def_property(srna, "modules", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "modules", NULL); @@ -4830,46 +4830,46 @@ static void rna_def_gpu_fx(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_GPUFXSettings_fx_update"); } -static void rna_def_scene_layers(BlenderRNA *brna, PropertyRNA *cprop) +static void rna_def_view_layers(BlenderRNA *brna, PropertyRNA *cprop) { StructRNA *srna; FunctionRNA *func; PropertyRNA *parm; PropertyRNA *prop; - RNA_def_property_srna(cprop, "SceneLayers"); - srna = RNA_def_struct(brna, "SceneLayers", NULL); + RNA_def_property_srna(cprop, "ViewLayers"); + srna = RNA_def_struct(brna, "ViewLayers", NULL); RNA_def_struct_sdna(srna, "Scene"); RNA_def_struct_ui_text(srna, "Render Layers", "Collection of render layers"); prop = RNA_def_property(srna, "active_index", PROP_INT, PROP_UNSIGNED); - RNA_def_property_int_sdna(prop, NULL, "active_layer"); - RNA_def_property_int_funcs(prop, "rna_SceneLayer_active_layer_index_get", - "rna_SceneLayer_active_layer_index_set", - "rna_SceneLayer_active_layer_index_range"); - RNA_def_property_ui_text(prop, "Active Layer Index", "Active index in render layer array"); + RNA_def_property_int_sdna(prop, NULL, "active_view_layer"); + RNA_def_property_int_funcs(prop, "rna_ViewLayer_active_view_layer_index_get", + "rna_ViewLayer_active_view_layer_index_set", + "rna_ViewLayer_active_view_layer_index_range"); + RNA_def_property_ui_text(prop, "Active View Layer Index", "Active index in view layer array"); RNA_def_property_update(prop, NC_SCENE | ND_LAYER, NULL); prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE); - RNA_def_property_struct_type(prop, "SceneLayer"); - RNA_def_property_pointer_funcs(prop, "rna_SceneLayer_active_layer_get", - "rna_SceneLayer_active_layer_set", NULL, NULL); + RNA_def_property_struct_type(prop, "ViewLayer"); + RNA_def_property_pointer_funcs(prop, "rna_ViewLayer_active_view_layer_get", + "rna_ViewLayer_active_view_layer_set", NULL, NULL); RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_NULL); - RNA_def_property_ui_text(prop, "Active Render Layer", "Active Render Layer"); + RNA_def_property_ui_text(prop, "Active View Layer", "Active View Layer"); RNA_def_property_update(prop, NC_SCENE | ND_LAYER, NULL); - func = RNA_def_function(srna, "new", "rna_SceneLayer_new"); - RNA_def_function_ui_description(func, "Add a render layer to scene"); + func = RNA_def_function(srna, "new", "rna_ViewLayer_new"); + RNA_def_function_ui_description(func, "Add a view layer to scene"); RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN); - parm = RNA_def_string(func, "name", "SceneLayer", 0, "", "New name for the render layer (not unique)"); + parm = RNA_def_string(func, "name", "ViewLayer", 0, "", "New name for the view layer (not unique)"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - parm = RNA_def_pointer(func, "result", "SceneLayer", "", "Newly created render layer"); + parm = RNA_def_pointer(func, "result", "ViewLayer", "", "Newly created view layer"); RNA_def_function_return(func, parm); - func = RNA_def_function(srna, "remove", "rna_SceneLayer_remove"); - RNA_def_function_ui_description(func, "Remove a render layer"); + func = RNA_def_function(srna, "remove", "rna_ViewLayer_remove"); + RNA_def_function_ui_description(func, "Remove a view layer"); RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN | FUNC_USE_REPORTS); - parm = RNA_def_pointer(func, "layer", "SceneLayer", "", "Render layer to remove"); + parm = RNA_def_pointer(func, "layer", "ViewLayer", "", "View layer to remove"); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR); RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0); } @@ -6853,7 +6853,7 @@ void RNA_def_scene(BlenderRNA *brna) /* Render Engine Data */ prop = RNA_def_property(srna, "layer_properties", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "layer_properties->data.group", NULL); - RNA_def_property_struct_type(prop, "SceneLayerSettings"); + RNA_def_property_struct_type(prop, "ViewLayerSettings"); RNA_def_property_ui_text(prop, "Layer Settings", "Engine specific render settings to be overridden by layers"); @@ -6932,7 +6932,7 @@ void RNA_def_scene(BlenderRNA *brna) /* Statistics */ func = RNA_def_function(srna, "statistics", "ED_info_stats_string"); - parm = RNA_def_pointer(func, "scene_layer", "SceneLayer", "", "Active layer"); + parm = RNA_def_pointer(func, "view_layer", "ViewLayer", "", "Active layer"); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); parm = RNA_def_string(func, "statistics", NULL, 0, "Statistics", ""); RNA_def_function_return(func, parm); @@ -6970,11 +6970,11 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Sequencer Color Space Settings", "Settings of color space sequencer is working in"); /* Layer and Collections */ - prop = RNA_def_property(srna, "render_layers", PROP_COLLECTION, PROP_NONE); - RNA_def_property_collection_sdna(prop, NULL, "render_layers", NULL); - RNA_def_property_struct_type(prop, "SceneLayer"); - RNA_def_property_ui_text(prop, "Render Layers", ""); - rna_def_scene_layers(brna, prop); + prop = RNA_def_property(srna, "view_layers", PROP_COLLECTION, PROP_NONE); + RNA_def_property_collection_sdna(prop, NULL, "view_layers", NULL); + RNA_def_property_struct_type(prop, "ViewLayer"); + RNA_def_property_ui_text(prop, "View Layers", ""); + rna_def_view_layers(brna, prop); prop = RNA_def_property(srna, "master_collection", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index 3cdb6433882..b245d12bbd5 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -85,16 +85,16 @@ static void rna_Scene_frame_set(Scene *scene, Main *bmain, int frame, float subf BPy_BEGIN_ALLOW_THREADS; #endif - for (SceneLayer *scene_layer = scene->render_layers.first; - scene_layer != NULL; - scene_layer = scene_layer->next) + for (ViewLayer *view_layer = scene->view_layers.first; + view_layer != NULL; + view_layer = view_layer->next) { - Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, scene_layer, true); + Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true); BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, - scene_layer); + view_layer); } #ifdef WITH_PYTHON @@ -135,16 +135,16 @@ static void rna_Scene_update_tagged(Scene *scene, Main *bmain) BPy_BEGIN_ALLOW_THREADS; #endif - for (SceneLayer *scene_layer = scene->render_layers.first; - scene_layer != NULL; - scene_layer = scene_layer->next) + for (ViewLayer *view_layer = scene->view_layers.first; + view_layer != NULL; + view_layer = view_layer->next) { - Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, scene_layer, true); + Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true); BKE_scene_graph_update_tagged(bmain->eval_ctx, depsgraph, bmain, scene, - scene_layer); + view_layer); } #ifdef WITH_PYTHON @@ -171,7 +171,7 @@ static void rna_SceneRender_get_frame_path(RenderData *rd, int frame, int previe } static void rna_Scene_ray_cast( - Scene *scene, SceneLayer *scene_layer, const char *engine_id, + Scene *scene, ViewLayer *view_layer, const char *engine_id, float origin[3], float direction[3], float ray_dist, int *r_success, float r_location[3], float r_normal[3], int *r_index, Object **r_ob, float r_obmat[16]) @@ -188,7 +188,7 @@ static void rna_Scene_ray_cast( normalize_v3(direction); SnapObjectContext *sctx = ED_transform_snap_object_context_create( - G.main, scene, scene_layer, engine, 0); + G.main, scene, view_layer, engine, 0); bool ret = ED_transform_snap_object_project_ray_ex( sctx, @@ -325,7 +325,7 @@ static void rna_Scene_collada_export( collada_export(&eval_ctx, scene, - CTX_data_scene_layer(C), + CTX_data_view_layer(C), filepath, apply_modifiers, @@ -384,7 +384,7 @@ void RNA_api_scene(StructRNA *srna) /* Ray Cast */ func = RNA_def_function(srna, "ray_cast", "rna_Scene_ray_cast"); RNA_def_function_ui_description(func, "Cast a ray onto in object space"); - parm = RNA_def_pointer(func, "scene_layer", "SceneLayer", "", "Scene Layer"); + parm = RNA_def_pointer(func, "view_layer", "ViewLayer", "", "Scene Layer"); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); parm = RNA_def_string(func, "engine", NULL, MAX_NAME, "Engine", "Render engine, use scene one by default"); /* ray start and end */ diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index fd2ac7595e2..a2edb072102 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -156,9 +156,9 @@ static PointerRNA rna_ParticleBrush_curve_get(PointerRNA *ptr) static void rna_ParticleEdit_redo(bContext *C, PointerRNA *UNUSED(ptr)) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Object *ob = OBACT(scene_layer); - PTCacheEdit *edit = PE_get_current(scene, scene_layer, ob); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob = OBACT(view_layer); + PTCacheEdit *edit = PE_get_current(scene, view_layer, ob); if (!edit) return; @@ -168,8 +168,8 @@ static void rna_ParticleEdit_redo(bContext *C, PointerRNA *UNUSED(ptr)) static void rna_ParticleEdit_update(Main *UNUSED(bmain), Scene *UNUSED(scene), bContext *C, PointerRNA *UNUSED(ptr)) { - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Object *ob = OBACT(scene_layer); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob = OBACT(view_layer); if (ob) DEG_id_tag_update(&ob->id, OB_RECALC_DATA); } @@ -179,8 +179,8 @@ static void rna_ParticleEdit_tool_set(PointerRNA *ptr, int value) ParticleEditSettings *pset = (ParticleEditSettings *)ptr->data; /* redraw hair completely if weight brush is/was used */ - if ((pset->brushtype == PE_BRUSH_WEIGHT || value == PE_BRUSH_WEIGHT) && pset->scene_layer) { - Object *ob = (pset->scene_layer->basact) ? pset->scene_layer->basact->object : NULL; + if ((pset->brushtype == PE_BRUSH_WEIGHT || value == PE_BRUSH_WEIGHT) && pset->view_layer) { + Object *ob = (pset->view_layer->basact) ? pset->view_layer->basact->object : NULL; if (ob) { DEG_id_tag_update(&ob->id, OB_RECALC_DATA); WM_main_add_notifier(NC_OBJECT | ND_PARTICLE | NA_EDITED, NULL); @@ -192,8 +192,8 @@ static void rna_ParticleEdit_tool_set(PointerRNA *ptr, int value) static const EnumPropertyItem *rna_ParticleEdit_tool_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *UNUSED(r_free)) { - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Object *ob = OBACT(scene_layer); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob = OBACT(view_layer); #if 0 Scene *scene = CTX_data_scene(C); PTCacheEdit *edit = PE_get_current(scene, ob); @@ -221,14 +221,14 @@ static int rna_ParticleEdit_editable_get(PointerRNA *ptr) { ParticleEditSettings *pset = (ParticleEditSettings *)ptr->data; - return (pset->object && pset->scene && PE_get_current(pset->scene, pset->scene_layer, pset->object)); + return (pset->object && pset->scene && PE_get_current(pset->scene, pset->view_layer, pset->object)); } static int rna_ParticleEdit_hair_get(PointerRNA *ptr) { ParticleEditSettings *pset = (ParticleEditSettings *)ptr->data; if (pset->scene) { - PTCacheEdit *edit = PE_get_current(pset->scene, pset->scene_layer, pset->object); + PTCacheEdit *edit = PE_get_current(pset->scene, pset->view_layer, pset->object); return (edit && edit->psys); } @@ -266,8 +266,8 @@ static int rna_Brush_mode_poll(PointerRNA *ptr, PointerRNA value) static void rna_Sculpt_update(bContext *C, PointerRNA *UNUSED(ptr)) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Object *ob = OBACT(scene_layer); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob = OBACT(view_layer); if (ob) { DEG_id_tag_update(&ob->id, OB_RECALC_DATA); @@ -282,8 +282,8 @@ static void rna_Sculpt_update(bContext *C, PointerRNA *UNUSED(ptr)) static void rna_Sculpt_ShowDiffuseColor_update(bContext *C, Scene *scene, PointerRNA *UNUSED(ptr)) { - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Object *ob = OBACT(scene_layer); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob = OBACT(view_layer); if (ob && ob->sculpt) { Sculpt *sd = scene->toolsettings->sculpt; @@ -345,8 +345,8 @@ static void rna_ImaPaint_viewport_update(Main *UNUSED(bmain), Scene *UNUSED(scen static void rna_ImaPaint_mode_update(bContext *C, PointerRNA *UNUSED(ptr)) { Scene *scene = CTX_data_scene(C);\ - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Object *ob = OBACT(scene_layer); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob = OBACT(view_layer); if (ob && ob->type == OB_MESH) { /* of course we need to invalidate here */ @@ -362,8 +362,8 @@ static void rna_ImaPaint_mode_update(bContext *C, PointerRNA *UNUSED(ptr)) static void rna_ImaPaint_stencil_update(bContext *C, PointerRNA *UNUSED(ptr)) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Object *ob = OBACT(scene_layer); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob = OBACT(view_layer); if (ob && ob->type == OB_MESH) { GPU_drawobject_free(ob->derivedFinal); @@ -376,8 +376,8 @@ static void rna_ImaPaint_canvas_update(bContext *C, PointerRNA *UNUSED(ptr)) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Object *ob = OBACT(scene_layer); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob = OBACT(view_layer); bScreen *sc; Image *ima = scene->toolsettings->imapaint.canvas; diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index d908426a9e7..3a496d13429 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -197,7 +197,7 @@ const EnumPropertyItem rna_enum_clip_editor_mode_items[] = { static const EnumPropertyItem buttons_context_items[] = { {BCONTEXT_SCENE, "SCENE", ICON_SCENE_DATA, "Scene", "Scene"}, {BCONTEXT_RENDER, "RENDER", ICON_SCENE, "Render", "Render"}, - {BCONTEXT_RENDER_LAYER, "RENDER_LAYER", ICON_RENDERLAYERS, "Render Layers", "Render layers"}, + {BCONTEXT_VIEW_LAYER, "VIEW_LAYER", ICON_RENDERLAYERS, "View Layers", "View layers"}, {BCONTEXT_WORLD, "WORLD", ICON_WORLD, "World", "World"}, {BCONTEXT_OBJECT, "OBJECT", ICON_OBJECT_DATA, "Object", "Object"}, {BCONTEXT_CONSTRAINT, "CONSTRAINT", ICON_CONSTRAINT, "Constraints", "Object constraints"}, @@ -553,7 +553,7 @@ static void rna_SpaceView3D_layer_set(PointerRNA *ptr, const int *values) { View3D *v3d = (View3D *)(ptr->data); - v3d->lay = ED_view3d_scene_layer_set(v3d->lay, values, &v3d->layact); + v3d->lay = ED_view3d_view_layer_set(v3d->lay, values, &v3d->layact); } static int rna_SpaceView3D_active_layer_get(PointerRNA *ptr) @@ -862,9 +862,9 @@ static int rna_SpaceImageEditor_show_maskedit_get(PointerRNA *ptr) SpaceImage *sima = (SpaceImage *)(ptr->data); bScreen *sc = (bScreen *)ptr->id.data; Scene *scene = ED_screen_scene_find(sc, G.main->wm.first); - SceneLayer *scene_layer = BKE_scene_layer_context_active_PLACEHOLDER(scene); + ViewLayer *view_layer = BKE_view_layer_context_active_PLACEHOLDER(scene); - return ED_space_image_check_show_maskedit(scene_layer, sima); + return ED_space_image_check_show_maskedit(view_layer, sima); } static void rna_SpaceImageEditor_image_set(PointerRNA *ptr, PointerRNA value) @@ -1119,8 +1119,8 @@ static const EnumPropertyItem *rna_SpaceProperties_context_itemf(bContext *UNUSE RNA_enum_items_add_value(&item, &totitem, buttons_context_items, BCONTEXT_RENDER); } - if (sbuts->pathflag & (1 << BCONTEXT_RENDER_LAYER)) { - RNA_enum_items_add_value(&item, &totitem, buttons_context_items, BCONTEXT_RENDER_LAYER); + if (sbuts->pathflag & (1 << BCONTEXT_VIEW_LAYER)) { + RNA_enum_items_add_value(&item, &totitem, buttons_context_items, BCONTEXT_VIEW_LAYER); } if (sbuts->pathflag & (1 << BCONTEXT_SCENE)) { @@ -1323,9 +1323,9 @@ static void rna_SpaceDopeSheetEditor_action_set(PointerRNA *ptr, PointerRNA valu static void rna_SpaceDopeSheetEditor_action_update(bContext *C, PointerRNA *ptr) { SpaceAction *saction = (SpaceAction *)(ptr->data); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Main *bmain = CTX_data_main(C); - Object *obact = OBACT(scene_layer); + Object *obact = OBACT(view_layer); /* we must set this action to be the one used by active object (if not pinned) */ if (obact /* && saction->pin == 0*/) { @@ -1400,8 +1400,8 @@ static void rna_SpaceDopeSheetEditor_action_update(bContext *C, PointerRNA *ptr) static void rna_SpaceDopeSheetEditor_mode_update(bContext *C, PointerRNA *ptr) { SpaceAction *saction = (SpaceAction *)(ptr->data); - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Object *obact = OBACT(scene_layer); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *obact = OBACT(view_layer); /* special exceptions for ShapeKey Editor mode */ if (saction->mode == SACTCONT_SHAPEKEY) { @@ -2110,7 +2110,7 @@ static void rna_def_space_outliner(BlenderRNA *brna) {SO_USERDEF, "USER_PREFERENCES", 0, "User Preferences", "Display user preference data"}, {SO_ID_ORPHANS, "ORPHAN_DATA", 0, "Orphan Data", "Display data-blocks which are unused and/or will be lost when the file is reloaded"}, - {SO_ACT_LAYER, "ACT_LAYER", 0, "Active Render Layer", "Display the collections of the active render layer"}, + {SO_ACT_LAYER, "ACT_LAYER", 0, "Active View Layer", "Display the collections of the active view layer"}, {SO_COLLECTIONS, "MASTER_COLLECTION", 0, "Master Collection Tree", "Display all collections based on the " "master collection hierarchy"}, {0, NULL, 0, NULL, NULL} diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 06ffc2ee292..43fe7bd3f76 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -248,8 +248,8 @@ void rna_TextureSlot_update(bContext *C, PointerRNA *ptr) { Scene *scene = CTX_data_scene(C); MTex *mtex = ptr->data; - SceneLayer *scene_layer = CTX_data_scene_layer(C); - BKE_paint_invalidate_overlay_tex(scene, scene_layer, mtex->tex); + ViewLayer *view_layer = CTX_data_view_layer(C); + BKE_paint_invalidate_overlay_tex(scene, view_layer, mtex->tex); WM_main_add_notifier(NC_BRUSH, id); break; } diff --git a/source/blender/makesrna/intern/rna_workspace.c b/source/blender/makesrna/intern/rna_workspace.c index 354e400a392..7e7b2eeccd7 100644 --- a/source/blender/makesrna/intern/rna_workspace.c +++ b/source/blender/makesrna/intern/rna_workspace.c @@ -95,28 +95,28 @@ static PointerRNA rna_workspace_transform_orientations_item_get(CollectionProper return rna_pointer_inherit_refine(&iter->parent, &RNA_TransformOrientation, transform_orientation); } -static PointerRNA rna_workspace_render_layer_get(PointerRNA *ptr) +static PointerRNA rna_workspace_view_layer_get(PointerRNA *ptr) { WorkSpace *workspace = ptr->data; - SceneLayer *render_layer = BKE_workspace_render_layer_get(workspace); + ViewLayer *view_layer = BKE_workspace_view_layer_get(workspace); /* XXX hmrf... lookup in getter... but how could we avoid it? */ for (Scene *scene = G.main->scene.first; scene; scene = scene->id.next) { - if (BLI_findindex(&scene->render_layers, render_layer) != -1) { + if (BLI_findindex(&scene->view_layers, view_layer) != -1) { PointerRNA scene_ptr; RNA_id_pointer_create(&scene->id, &scene_ptr); - return rna_pointer_inherit_refine(&scene_ptr, &RNA_SceneLayer, render_layer); + return rna_pointer_inherit_refine(&scene_ptr, &RNA_ViewLayer, view_layer); } } return PointerRNA_NULL; } -static void rna_workspace_render_layer_set(PointerRNA *ptr, PointerRNA value) +static void rna_workspace_view_layer_set(PointerRNA *ptr, PointerRNA value) { WorkSpace *workspace = ptr->data; - BKE_workspace_render_layer_set(workspace, value.data); + BKE_workspace_view_layer_set(workspace, value.data); } #else /* RNA_RUNTIME */ @@ -168,11 +168,11 @@ static void rna_def_workspace(BlenderRNA *brna) "rna_workspace_transform_orientations_item_get", NULL, NULL, NULL, NULL); RNA_def_property_ui_text(prop, "Transform Orientations", ""); - prop = RNA_def_property(srna, "render_layer", PROP_POINTER, PROP_NONE); - RNA_def_property_struct_type(prop, "SceneLayer"); - RNA_def_property_pointer_funcs(prop, "rna_workspace_render_layer_get", "rna_workspace_render_layer_set", + prop = RNA_def_property(srna, "view_layer", PROP_POINTER, PROP_NONE); + RNA_def_property_struct_type(prop, "ViewLayer"); + RNA_def_property_pointer_funcs(prop, "rna_workspace_view_layer_get", "rna_workspace_view_layer_set", NULL, NULL); - RNA_def_property_ui_text(prop, "Active Render Layer", "The active render layer used in this workspace"); + RNA_def_property_ui_text(prop, "Active View Layer", "The active view layer used in this workspace"); RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_NULL); RNA_def_property_update(prop, NC_SCREEN | ND_LAYER, NULL); diff --git a/source/blender/nodes/NOD_composite.h b/source/blender/nodes/NOD_composite.h index 1275729cfdb..dfcb83b873a 100644 --- a/source/blender/nodes/NOD_composite.h +++ b/source/blender/nodes/NOD_composite.h @@ -140,7 +140,7 @@ void register_node_type_cmp_planetrackdeform(void); void register_node_type_cmp_cornerpin(void); void node_cmp_rlayers_outputs(struct bNodeTree *ntree, struct bNode *node); -void node_cmp_rlayers_register_pass(struct bNodeTree *ntree, struct bNode *node, struct Scene *scene, struct SceneLayer *scene_layer, const char *name, int type); +void node_cmp_rlayers_register_pass(struct bNodeTree *ntree, struct bNode *node, struct Scene *scene, struct ViewLayer *view_layer, const char *name, int type); const char *node_cmp_rlayers_sock_to_pass(int sock_index); #endif diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index 740e9c6eb07..8cb25d9167f 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -261,7 +261,7 @@ void ntreeCompositUpdateRLayers(bNodeTree *ntree) } -void ntreeCompositRegisterPass(bNodeTree *ntree, Scene *scene, SceneLayer *scene_layer, const char *name, int type) +void ntreeCompositRegisterPass(bNodeTree *ntree, Scene *scene, ViewLayer *view_layer, const char *name, int type) { bNode *node; @@ -269,7 +269,7 @@ void ntreeCompositRegisterPass(bNodeTree *ntree, Scene *scene, SceneLayer *scene for (node = ntree->nodes.first; node; node = node->next) { if (node->type == CMP_NODE_R_LAYERS) - node_cmp_rlayers_register_pass(ntree, node, scene, scene_layer, name, type); + node_cmp_rlayers_register_pass(ntree, node, scene, view_layer, name, type); } } diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c index 0bcbce3326f..bd7c4df317f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.c +++ b/source/blender/nodes/composite/nodes/node_composite_image.c @@ -191,16 +191,16 @@ typedef struct RLayerUpdateData { int prev_index; } RLayerUpdateData; -void node_cmp_rlayers_register_pass(bNodeTree *ntree, bNode *node, Scene *scene, SceneLayer *scene_layer, const char *name, int type) +void node_cmp_rlayers_register_pass(bNodeTree *ntree, bNode *node, Scene *scene, ViewLayer *view_layer, const char *name, int type) { RLayerUpdateData *data = node->storage; - if (scene == NULL || scene_layer == NULL || data == NULL || node->id != (ID *)scene) { + if (scene == NULL || view_layer == NULL || data == NULL || node->id != (ID *)scene) { return; } - SceneLayer *node_scene_layer = BLI_findlink(&scene->render_layers, node->custom1); - if (node_scene_layer != scene_layer) { + ViewLayer *node_view_layer = BLI_findlink(&scene->view_layers, node->custom1); + if (node_view_layer != view_layer) { return; } @@ -221,15 +221,15 @@ static void cmp_node_rlayer_create_outputs(bNodeTree *ntree, bNode *node, LinkNo if (scene) { RenderEngineType *engine_type = RE_engines_find(scene->view_render.engine_id); if (engine_type && engine_type->update_render_passes) { - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, node->custom1); - if (scene_layer) { + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, node->custom1); + if (view_layer) { RLayerUpdateData *data = MEM_mallocN(sizeof(RLayerUpdateData), "render layer update data"); data->available_sockets = available_sockets; data->prev_index = -1; node->storage = data; RenderEngine *engine = RE_engine_create(engine_type); - engine_type->update_render_passes(engine, scene, scene_layer); + engine_type->update_render_passes(engine, scene, view_layer); RE_engine_free(engine); MEM_freeN(data); diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index 5bc144e8e07..dc48aa324b2 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -85,8 +85,8 @@ static void shader_get_from_context(const bContext *C, bNodeTreeType *UNUSED(tre SpaceNode *snode = CTX_wm_space_node(C); Scene *scene = CTX_data_scene(C); WorkSpace *workspace = CTX_wm_workspace(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Object *ob = OBACT(scene_layer); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob = OBACT(view_layer); ViewRender *view_render = BKE_viewrender_get(scene, workspace); if ((snode->shaderfrom == SNODE_SHADER_OBJECT) || diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c index 643f187de9b..dcae9d2345f 100644 --- a/source/blender/nodes/texture/node_texture_tree.c +++ b/source/blender/nodes/texture/node_texture_tree.c @@ -62,8 +62,8 @@ static void texture_get_from_context(const bContext *C, bNodeTreeType *UNUSED(tr { SpaceNode *snode = CTX_wm_space_node(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); - Object *ob = OBACT(scene_layer); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob = OBACT(view_layer); Tex *tx = NULL; if (snode->texfrom == SNODE_TEX_OBJECT) { diff --git a/source/blender/python/intern/gpu_offscreen.c b/source/blender/python/intern/gpu_offscreen.c index 12e9f02be93..226bfcc7c21 100644 --- a/source/blender/python/intern/gpu_offscreen.c +++ b/source/blender/python/intern/gpu_offscreen.c @@ -164,13 +164,13 @@ static PyObject *pygpu_offscreen_draw_view3d(BPy_GPUOffScreen *self, PyObject *a { /* TODO: This doesn't work currently because of eval_ctx. */ #if 0 - static const char *kwlist[] = {"scene", "render_layer", "view3d", "region", "projection_matrix", "modelview_matrix", NULL}; + static const char *kwlist[] = {"scene", "view_layer", "view3d", "region", "projection_matrix", "modelview_matrix", NULL}; MatrixObject *py_mat_modelview, *py_mat_projection; - PyObject *py_scene, *py_scene_layer, *py_region, *py_view3d; + PyObject *py_scene, *py_view_layer, *py_region, *py_view3d; Scene *scene; - SceneLayer *scene_layer; + ViewLayer *view_layer; View3D *v3d; ARegion *ar; GPUFX *fx; @@ -181,11 +181,11 @@ static PyObject *pygpu_offscreen_draw_view3d(BPy_GPUOffScreen *self, PyObject *a if (!PyArg_ParseTupleAndKeywords( args, kwds, "OOOOO&O&:draw_view3d", (char **)(kwlist), - &py_scene, &py_scene_layer, &py_view3d, &py_region, + &py_scene, &py_view_layer, &py_view3d, &py_region, Matrix_Parse4x4, &py_mat_projection, Matrix_Parse4x4, &py_mat_modelview) || (!(scene = PyC_RNA_AsPointer(py_scene, "Scene")) || - !(scene_layer = PyC_RNA_AsPointer(py_scene_layer, "SceneLayer")) || + !(view_layer = PyC_RNA_AsPointer(py_view_layer, "ViewLayer")) || !(v3d = PyC_RNA_AsPointer(py_view3d, "SpaceView3D")) || !(ar = PyC_RNA_AsPointer(py_region, "Region")))) { @@ -196,14 +196,14 @@ static PyObject *pygpu_offscreen_draw_view3d(BPy_GPUOffScreen *self, PyObject *a fx_settings = v3d->fx_settings; /* full copy */ - ED_view3d_draw_offscreen_init(scene, scene_layer, v3d); + ED_view3d_draw_offscreen_init(scene, view_layer, v3d); rv3d_mats = ED_view3d_mats_rv3d_backup(ar->regiondata); GPU_offscreen_bind(self->ofs, true); /* bind */ ED_view3d_draw_offscreen( - scene, scene_layer, v3d, ar, GPU_offscreen_width(self->ofs), GPU_offscreen_height(self->ofs), + scene, view_layer, v3d, ar, GPU_offscreen_width(self->ofs), GPU_offscreen_height(self->ofs), (float(*)[4])py_mat_modelview->matrix, (float(*)[4])py_mat_projection->matrix, false, true, true, "", fx, &fx_settings, diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index 0f1c8e86688..60ffd8f42e4 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -102,7 +102,7 @@ typedef struct RenderEngineType { void (*render_to_view)(struct RenderEngine *engine, const struct bContext *context); void (*update_script_node)(struct RenderEngine *engine, struct bNodeTree *ntree, struct bNode *node); - void (*update_render_passes)(struct RenderEngine *engine, struct Scene *scene, struct SceneLayer *scene_layer); + void (*update_render_passes)(struct RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer); void (*collection_settings_create)(struct RenderEngine *engine, struct IDProperty *props); void (*render_settings_create)(struct RenderEngine *engine, struct IDProperty *props); @@ -174,7 +174,7 @@ bool RE_engine_is_external(struct Render *re); void RE_engine_frame_set(struct RenderEngine *engine, int frame, float subframe); -void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, struct SceneLayer *scene_layer, +void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer, const char *name, int channels, const char *chanid, int type); /* Engine Types */ @@ -190,7 +190,7 @@ struct RenderData *RE_engine_get_render_data(struct Render *re); void RE_bake_engine_set_engine_parameters( struct Render *re, struct Main *bmain, struct Depsgraph *graph, struct Scene *scene); -struct SceneLayer *RE_engine_get_scene_layer(struct Render *re); +struct ViewLayer *RE_engine_get_view_layer(struct Render *re); #endif /* __RE_ENGINE_H__ */ diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 711d350d51e..a0f3a053618 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -48,7 +48,7 @@ struct RenderData; struct RenderResult; struct ReportList; struct Scene; -struct SceneLayer; +struct ViewLayer; struct EnvMap; struct StampData; struct ViewRender; @@ -241,7 +241,7 @@ struct RenderPass *RE_create_gp_pass(struct RenderResult *rr, const char *layern /* obligatory initialize call, disprect is optional */ void RE_InitState(struct Render *re, struct Render *source, struct RenderData *rd, struct ListBase *render_layers, const int active_layer, - struct ViewRender *view_render, struct SceneLayer *scene_layer, + struct ViewRender *view_render, struct ViewLayer *view_layer, int winx, int winy, rcti *disprect); void RE_ChangeResolution(struct Render *re, int winx, int winy, rcti *disprect); void RE_ChangeModeFlag(struct Render *re, int flag, bool clear); @@ -290,7 +290,7 @@ bool RE_WriteRenderViewsMovie( /* only RE_NewRender() needed, main Blender render calls */ void RE_BlenderFrame(struct Render *re, struct Main *bmain, struct Scene *scene, - struct SceneLayer *scene_layer, struct Object *camera_override, + struct ViewLayer *view_layer, struct Object *camera_override, unsigned int lay_override, int frame, const bool write_still); void RE_BlenderAnim(struct Render *re, struct Main *bmain, struct Scene *scene, struct Object *camera_override, unsigned int lay_override, int sfra, int efra, int tfra); diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h index aad4f511b65..17b321fd3b4 100644 --- a/source/blender/render/extern/include/RE_render_ext.h +++ b/source/blender/render/extern/include/RE_render_ext.h @@ -41,7 +41,7 @@ struct DerivedMesh; struct ImagePool; struct MTex; struct Scene; -struct SceneLayer; +struct ViewLayer; struct Render; /* render_texture.c */ @@ -72,20 +72,20 @@ struct PointDensity; void RE_point_density_cache( struct Scene *scene, - struct SceneLayer *scene_layer, + struct ViewLayer *view_layer, struct PointDensity *pd, const bool use_render_params); void RE_point_density_minmax( struct Scene *scene, - struct SceneLayer *scene_layer, + struct ViewLayer *view_layer, struct PointDensity *pd, const bool use_render_params, float r_min[3], float r_max[3]); void RE_point_density_sample( struct Scene *scene, - struct SceneLayer *scene_layer, + struct ViewLayer *view_layer, struct PointDensity *pd, const int resolution, const bool use_render_params, diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index 8f572c34f3d..d24aae6ac97 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -192,8 +192,8 @@ struct Render { struct Main *main; Scene *scene; RenderData r; - ListBase render_layers; - int active_layer; + ListBase view_layers; + int active_view_layer; World wrld; ViewRender view_render; struct Object *camera_override; diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h index 14c3d798e4f..c01db7db53e 100644 --- a/source/blender/render/intern/include/rendercore.h +++ b/source/blender/render/intern/include/rendercore.h @@ -83,7 +83,7 @@ void zbufshade_sss_tile(struct RenderPart *pa); int get_sample_layers(struct RenderPart *pa, struct RenderLayer *rl, struct RenderLayer **rlpp); -void render_internal_update_passes(struct RenderEngine *engine, struct Scene *scene, struct SceneLayer *scene_layer); +void render_internal_update_passes(struct RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer); /* -------- ray.c ------- */ diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 496349e4ca6..81ed4c71b17 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4939,7 +4939,7 @@ static void dupli_render_particle_set(Render *re, Object *ob, int timeoffset, in dupli_render_particle_set(re, go->ob, timeoffset, level+1, enable); } -static int get_vector_renderlayers(Scene *UNUSED(sce)) +static int get_vector_viewlayers(Scene *UNUSED(sce)) { return 0; } @@ -5010,7 +5010,7 @@ static void database_init_objects(Render *re, unsigned int UNUSED(renderlay), in /* in the prev/next pass for making speed vectors, avoid creating * objects that are not on a renderlayer with a vector pass, can * save a lot of time in complex scenes */ - vectorlay= get_vector_renderlayers(re->scene); + vectorlay= get_vector_viewlayers(re->scene); #endif /* if the object is not visible, ignore it */ @@ -5203,7 +5203,7 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l /* applies changes fully */ if ((re->r.scemode & (R_NO_FRAME_UPDATE|R_BUTS_PREVIEW|R_VIEWPORT_PREVIEW))==0) { BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, re->main, re->scene, NULL); - render_update_anim_renderdata(re, &re->scene->r, &re->scene->render_layers); + render_update_anim_renderdata(re, &re->scene->r, &re->scene->view_layers); } /* if no camera, viewmat should have been set! */ @@ -5789,7 +5789,7 @@ void RE_Database_FromScene_Vectors(Render *re, Main *bmain, Scene *sce, unsigned } if (!re->test_break(re->tbh)) { - int vectorlay= get_vector_renderlayers(re->scene); + int vectorlay= get_vector_viewlayers(re->scene); for (step= 0; step<2; step++) { diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c index c873de064eb..2a7aab58980 100644 --- a/source/blender/render/intern/source/envmap.c +++ b/source/blender/render/intern/source/envmap.c @@ -143,7 +143,7 @@ static Render *envmap_render_copy(Render *re, EnvMap *env) /* set up renderdata */ envre->r.mode &= ~(R_BORDER | R_PANORAMA | R_ORTHO | R_MBLUR); - BLI_freelistN(&envre->render_layers); + BLI_freelistN(&envre->view_layers); BLI_freelistN(&envre->r.views); envre->r.filtertype = 0; envre->r.tilex = envre->r.xsch / 2; @@ -151,7 +151,7 @@ static Render *envmap_render_copy(Render *re, EnvMap *env) envre->r.size = 100; envre->r.yasp = envre->r.xasp = 1; - RE_InitState(envre, NULL, &envre->r, &re->render_layers, re->active_layer, &envre->view_render, NULL, cuberes, cuberes, NULL); + RE_InitState(envre, NULL, &envre->r, &re->view_layers, re->active_view_layer, &envre->view_render, NULL, cuberes, cuberes, NULL); envre->main = re->main; envre->scene = re->scene; /* unsure about this... */ envre->scene_color_manage = re->scene_color_manage; diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 160f999f4e7..68077d4d93b 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -107,7 +107,7 @@ void RE_engines_exit(void) DRW_engines_free(); BKE_layer_collection_engine_settings_callback_free(); - BKE_scene_layer_engine_settings_callback_free(); + BKE_view_layer_engine_settings_callback_free(); for (type = R_engines.first; type; type = next) { next = type->next; @@ -133,7 +133,7 @@ void RE_engines_register(Main *bmain, RenderEngineType *render_type) bmain, render_type->idname, render_type->collection_settings_create); } if (render_type->render_settings_create) { - BKE_scene_layer_engine_settings_callback_register( + BKE_view_layer_engine_settings_callback_register( bmain, render_type->idname, render_type->render_settings_create); } BLI_addtail(&R_engines, render_type); @@ -658,7 +658,7 @@ int RE_engine_render(Render *re, int do_all) * creating the render result */ if ((re->r.scemode & (R_NO_FRAME_UPDATE | R_BUTS_PREVIEW)) == 0) { BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, re->main, re->scene, NULL); - render_update_anim_renderdata(re, &re->scene->r, &re->scene->render_layers); + render_update_anim_renderdata(re, &re->scene->r, &re->scene->view_layers); } /* create render result */ @@ -777,12 +777,12 @@ int RE_engine_render(Render *re, int do_all) return 1; } -void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, struct SceneLayer *scene_layer, +void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer, const char *name, int UNUSED(channels), const char *UNUSED(chanid), int type) { /* The channel information is currently not used, but is part of the API in case it's needed in the future. */ - if (!(scene && scene_layer && engine)) { + if (!(scene && view_layer && engine)) { return; } @@ -792,12 +792,12 @@ void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, s Scene *sce; for (sce = G.main->scene.first; sce; sce = sce->id.next) { if (sce->nodetree) { - ntreeCompositRegisterPass(sce->nodetree, scene, scene_layer, name, type); + ntreeCompositRegisterPass(sce->nodetree, scene, view_layer, name, type); } } } -SceneLayer *RE_engine_get_scene_layer(Render *re) +ViewLayer *RE_engine_get_view_layer(Render *re) { - return re->eval_ctx->scene_layer; + return re->eval_ctx->view_layer; } diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index ed74696ba78..7fdaf38a9ff 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -264,7 +264,7 @@ RenderResult *RE_MultilayerConvert(void *exrhandle, const char *colorspace, bool RenderLayer *render_get_active_layer(Render *re, RenderResult *rr) { - RenderLayer *rl = BLI_findlink(&rr->layers, re->active_layer); + RenderLayer *rl = BLI_findlink(&rr->layers, re->active_view_layer); if (rl) return rl; @@ -274,10 +274,10 @@ RenderLayer *render_get_active_layer(Render *re, RenderResult *rr) static int render_scene_needs_vector(Render *re) { - SceneLayer *scene_layer; - for (scene_layer = re->render_layers.first; scene_layer; scene_layer = scene_layer->next) - if (scene_layer->flag & SCENE_LAYER_RENDER) { - if (scene_layer->passflag & SCE_PASS_VECTOR) { + ViewLayer *view_layer; + for (view_layer = re->view_layers.first; view_layer; view_layer = view_layer->next) + if (view_layer->flag & VIEW_LAYER_RENDER) { + if (view_layer->passflag & SCE_PASS_VECTOR) { return 1; } } @@ -286,9 +286,9 @@ static int render_scene_needs_vector(Render *re) static bool render_scene_has_layers_to_render(Scene *scene) { - SceneLayer *scene_layer; - for (scene_layer = scene->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - if (scene_layer->flag & SCENE_LAYER_RENDER) { + ViewLayer *view_layer; + for (view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + if (view_layer->flag & VIEW_LAYER_RENDER) { return true; } } @@ -584,7 +584,7 @@ void RE_FreeRender(Render *re) BLI_rw_mutex_end(&re->resultmutex); BLI_rw_mutex_end(&re->partsmutex); - BLI_freelistN(&re->render_layers); + BLI_freelistN(&re->view_layers); BLI_freelistN(&re->r.views); curvemapping_free_data(&re->r.mblur_shutter_curve); @@ -748,7 +748,7 @@ void render_copy_viewrender(ViewRender *to, ViewRender *from) /* disprect is optional, if NULL it assumes full window render */ void RE_InitState(Render *re, Render *source, RenderData *rd, ListBase *render_layers, const int active_layer, - ViewRender *view_render, SceneLayer *scene_layer, + ViewRender *view_render, ViewLayer *view_layer, int winx, int winy, rcti *disprect) { bool had_freestyle = (re->r.mode & R_EDGE_FRS) != 0; @@ -760,9 +760,9 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, /* copy render data and render layers for thread safety */ render_copy_renderdata(&re->r, rd); render_copy_viewrender(&re->view_render, view_render); - BLI_freelistN(&re->render_layers); - BLI_duplicatelist(&re->render_layers, render_layers); - re->active_layer = active_layer; + BLI_freelistN(&re->view_layers); + BLI_duplicatelist(&re->view_layers, render_layers); + re->active_view_layer = active_layer; if (source) { /* reuse border flags from source renderer */ @@ -811,10 +811,10 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, else re->osa = 0; } - if (scene_layer) { - int index = BLI_findindex(render_layers, scene_layer); + if (view_layer) { + int index = BLI_findindex(render_layers, view_layer); if (index != -1) { - re->active_layer = index; + re->active_view_layer = index; re->r.scemode |= R_SINGLE_LAYER; } } @@ -832,7 +832,7 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, re->result = NULL; } else if (re->result) { - SceneLayer *active_render_layer = BLI_findlink(&re->render_layers, re->active_layer); + ViewLayer *active_render_layer = BLI_findlink(&re->view_layers, re->active_view_layer); RenderLayer *rl; bool have_layer = false; @@ -976,8 +976,8 @@ void render_update_anim_renderdata(Render *re, RenderData *rd, ListBase *render_ re->r.unit_line_thickness = rd->unit_line_thickness; /* render layers */ - BLI_freelistN(&re->render_layers); - BLI_duplicatelist(&re->render_layers, render_layers); + BLI_freelistN(&re->view_layers); + BLI_duplicatelist(&re->view_layers, render_layers); /* render views */ BLI_freelistN(&re->r.views); @@ -1979,7 +1979,7 @@ static void render_scene(Render *re, Scene *sce, int cfra) } /* initial setup */ - RE_InitState(resc, re, &sce->r, &sce->render_layers, sce->active_layer, &sce->view_render, NULL, winx, winy, &re->disprect); + RE_InitState(resc, re, &sce->r, &sce->view_layers, sce->active_view_layer, &sce->view_render, NULL, winx, winy, &re->disprect); /* We still want to use 'rendercache' setting from org (main) scene... */ resc->r.scemode = (resc->r.scemode & ~R_EXR_CACHE_FILE) | (re->r.scemode & R_EXR_CACHE_FILE); @@ -2250,24 +2250,24 @@ static void init_freestyle(Render *re) /* invokes Freestyle stroke rendering */ static void add_freestyle(Render *re, int render) { - SceneLayer *scene_layer, *active_render_layer; + ViewLayer *view_layer, *active_view_layer; LinkData *link; Render *r; const bool do_link = (re->r.mode & R_MBLUR) == 0 || re->i.curblur == re->r.mblur_samples; - active_render_layer = BLI_findlink(&re->render_layers, re->active_layer); + active_view_layer = BLI_findlink(&re->view_layers, re->active_view_layer); FRS_begin_stroke_rendering(re); - for (scene_layer = (SceneLayer *)re->render_layers.first; scene_layer; scene_layer = scene_layer->next) { + for (view_layer = (ViewLayer *)re->view_layers.first; view_layer; view_layer = view_layer->next) { if (do_link) { link = (LinkData *)MEM_callocN(sizeof(LinkData), "LinkData to Freestyle render"); BLI_addtail(&re->freestyle_renders, link); } - if ((re->r.scemode & R_SINGLE_LAYER) && scene_layer != active_render_layer) + if ((re->r.scemode & R_SINGLE_LAYER) && view_layer != active_view_layer) continue; - if (FRS_is_freestyle_enabled(scene_layer)) { - r = FRS_do_stroke_rendering(re, scene_layer, render); + if (FRS_is_freestyle_enabled(view_layer)) { + r = FRS_do_stroke_rendering(re, view_layer, render); if (do_link) link->data = (void *)r; } @@ -2284,25 +2284,25 @@ static void composite_freestyle_renders(Render *re, int sample) { Render *freestyle_render; RenderView *rv; - SceneLayer *scene_layer, *active_scene_layer; + ViewLayer *view_layer, *active_view_layer; LinkData *link; - active_scene_layer = BLI_findlink(&re->render_layers, re->active_layer); + active_view_layer = BLI_findlink(&re->view_layers, re->active_view_layer); link = (LinkData *)re->freestyle_renders.first; for (rv = re->result->views.first; rv; rv = rv->next) { - for (scene_layer = (SceneLayer *)re->render_layers.first; scene_layer; scene_layer = scene_layer->next) { - if ((re->r.scemode & R_SINGLE_LAYER) && scene_layer != active_scene_layer) + for (view_layer = (ViewLayer *)re->view_layers.first; view_layer; view_layer = view_layer->next) { + if ((re->r.scemode & R_SINGLE_LAYER) && view_layer != active_view_layer) continue; - if (FRS_is_freestyle_enabled(scene_layer)) { + if (FRS_is_freestyle_enabled(view_layer)) { freestyle_render = (Render *)link->data; /* may be NULL in case of empty render layer */ if (freestyle_render) { render_result_exr_file_read_sample(freestyle_render, sample); - FRS_composite_result(re, scene_layer, freestyle_render); + FRS_composite_result(re, view_layer, freestyle_render); RE_FreeRenderResult(freestyle_render->result); freestyle_render->result = NULL; } @@ -2882,10 +2882,10 @@ bool RE_force_single_renderlayer(Scene *scene) { int scemode = check_mode_full_sample(&scene->r, &scene->view_render); if (scemode & R_SINGLE_LAYER) { - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); /* force layer to be enabled */ - if ((scene_layer->flag & SCENE_LAYER_RENDER) == 0) { - scene_layer->flag |= SCENE_LAYER_RENDER; + if ((view_layer->flag & VIEW_LAYER_RENDER) == 0) { + view_layer->flag |= VIEW_LAYER_RENDER; return true; } } @@ -2901,7 +2901,7 @@ static bool check_valid_compositing_camera(Scene *scene, Object *camera_override if (node->type == CMP_NODE_R_LAYERS && (node->flag & NODE_MUTED) == 0) { Scene *sce = node->id ? (Scene *)node->id : scene; if (sce->camera == NULL) { - sce->camera = BKE_scene_layer_camera_find(BKE_scene_layer_from_scene_get(sce)); + sce->camera = BKE_view_layer_camera_find(BKE_view_layer_from_scene_get(sce)); } if (sce->camera == NULL) { /* all render layers nodes need camera */ @@ -2959,7 +2959,7 @@ static int check_valid_camera(Scene *scene, Object *camera_override, ReportList const char *err_msg = "No camera found in scene \"%s\""; if (camera_override == NULL && scene->camera == NULL) - scene->camera = BKE_scene_layer_camera_find(BKE_scene_layer_from_scene_get(scene)); + scene->camera = BKE_view_layer_camera_find(BKE_view_layer_from_scene_get(scene)); if (!check_valid_camera_multiview(scene, scene->camera, reports)) return false; @@ -2975,7 +2975,7 @@ static int check_valid_camera(Scene *scene, Object *camera_override, ReportList { if (!seq->scene_camera) { if (!seq->scene->camera && - !BKE_scene_layer_camera_find(BKE_scene_layer_from_scene_get(seq->scene))) + !BKE_view_layer_camera_find(BKE_view_layer_from_scene_get(seq->scene))) { /* camera could be unneeded due to composite nodes */ Object *override = (seq->scene == scene) ? camera_override : NULL; @@ -3142,15 +3142,15 @@ static void validate_render_settings(Render *re) } } -static void update_physics_cache(Render *re, Scene *scene, SceneLayer *scene_layer, int UNUSED(anim_init)) +static void update_physics_cache(Render *re, Scene *scene, ViewLayer *view_layer, int UNUSED(anim_init)) { PTCacheBaker baker; memset(&baker, 0, sizeof(baker)); baker.main = re->main; baker.scene = scene; - baker.scene_layer = scene_layer; - baker.depsgraph = BKE_scene_get_depsgraph(scene, scene_layer, true); + baker.view_layer = view_layer; + baker.depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true); baker.bake = 0; baker.render = 1; baker.anim_init = 1; @@ -3176,7 +3176,7 @@ void RE_SetEngineByID(Render *re, const char *engine_id) /* evaluating scene options for general Blender render */ static int render_initialize_from_main(Render *re, RenderData *rd, Main *bmain, Scene *scene, ViewRender *view_render, - SceneLayer *scene_layer, Object *camera_override, unsigned int lay_override, + ViewLayer *view_layer, Object *camera_override, unsigned int lay_override, int anim, int anim_init) { int winx, winy; @@ -3215,7 +3215,7 @@ static int render_initialize_from_main(Render *re, RenderData *rd, Main *bmain, /* not too nice, but it survives anim-border render */ if (anim) { - render_update_anim_renderdata(re, &scene->r, &scene->render_layers); + render_update_anim_renderdata(re, &scene->r, &scene->view_layers); re->disprect = disprect; return 1; } @@ -3230,17 +3230,17 @@ static int render_initialize_from_main(Render *re, RenderData *rd, Main *bmain, */ if (0) { /* make sure dynamics are up to date */ - scene_layer = BKE_scene_layer_from_scene_get(scene); - update_physics_cache(re, scene, scene_layer, anim_init); + view_layer = BKE_view_layer_from_scene_get(scene); + update_physics_cache(re, scene, view_layer, anim_init); } - if (scene_layer || scene->r.scemode & R_SINGLE_LAYER) { + if (view_layer || scene->r.scemode & R_SINGLE_LAYER) { BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE); render_result_single_layer_begin(re); BLI_rw_mutex_unlock(&re->resultmutex); } - RE_InitState(re, NULL, &scene->r, &scene->render_layers, scene->active_layer, &scene->view_render, scene_layer, winx, winy, &disprect); + RE_InitState(re, NULL, &scene->r, &scene->view_layers, scene->active_view_layer, &scene->view_render, view_layer, winx, winy, &disprect); if (!re->ok) /* if an error was printed, abort */ return 0; @@ -3261,7 +3261,7 @@ void RE_SetReports(Render *re, ReportList *reports) } /* general Blender frame render call */ -void RE_BlenderFrame(Render *re, Main *bmain, Scene *scene, SceneLayer *scene_layer, Object *camera_override, +void RE_BlenderFrame(Render *re, Main *bmain, Scene *scene, ViewLayer *view_layer, Object *camera_override, unsigned int lay_override, int frame, const bool write_still) { BLI_callback_exec(re->main, (ID *)scene, BLI_CB_EVT_RENDER_INIT); @@ -3271,7 +3271,7 @@ void RE_BlenderFrame(Render *re, Main *bmain, Scene *scene, SceneLayer *scene_la scene->r.cfra = frame; - if (render_initialize_from_main(re, &scene->r, bmain, scene, &scene->view_render, scene_layer, + if (render_initialize_from_main(re, &scene->r, bmain, scene, &scene->view_render, view_layer, camera_override, lay_override, 0, 0)) { MEM_reset_peak_memory(); @@ -3851,13 +3851,13 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri void RE_PreviewRender(Render *re, Main *bmain, Scene *sce, ViewRender *view_render) { Object *camera; - SceneLayer *scene_layer = BKE_scene_layer_from_scene_get(sce); + ViewLayer *view_layer = BKE_view_layer_from_scene_get(sce); int winx, winy; winx = (sce->r.size * sce->r.xsch) / 100; winy = (sce->r.size * sce->r.ysch) / 100; - RE_InitState(re, NULL, &sce->r, &sce->render_layers, sce->active_layer, view_render, NULL, winx, winy, NULL); + RE_InitState(re, NULL, &sce->r, &sce->view_layers, sce->active_view_layer, view_render, NULL, winx, winy, NULL); re->pool = BKE_image_pool_new(); @@ -3865,8 +3865,8 @@ void RE_PreviewRender(Render *re, Main *bmain, Scene *sce, ViewRender *view_rend re->scene = sce; re->scene_color_manage = BKE_scene_check_color_management_enabled(sce); re->lay = sce->lay; - re->depsgraph = BKE_scene_get_depsgraph(sce, scene_layer, false); - re->eval_ctx->scene_layer = scene_layer; + re->depsgraph = BKE_scene_get_depsgraph(sce, view_layer, false); + re->eval_ctx->view_layer = view_layer; camera = RE_GetCamera(re); RE_SetCamera(re, camera); @@ -3912,7 +3912,7 @@ bool RE_ReadRenderResult(Scene *scene, Scene *scenode) re = RE_GetSceneRender(scene); if (re == NULL) re = RE_NewSceneRender(scene); - RE_InitState(re, NULL, &scene->r, &scene->render_layers, scene->active_layer, &scene->view_render, NULL, winx, winy, &disprect); + RE_InitState(re, NULL, &scene->r, &scene->view_layers, scene->active_view_layer, &scene->view_render, NULL, winx, winy, &disprect); re->scene = scene; re->scene_color_manage = BKE_scene_check_color_management_enabled(scene); diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c index 04786858b6b..e94a452c94a 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -945,7 +945,7 @@ static void particle_system_minmax(EvaluationContext *eval_ctx, void RE_point_density_cache( Scene *scene, - SceneLayer *scene_layer, + ViewLayer *view_layer, PointDensity *pd, const bool use_render_params) { @@ -955,7 +955,7 @@ void RE_point_density_cache( DEG_evaluation_context_init(&eval_ctx, use_render_params ? DAG_EVAL_RENDER : DAG_EVAL_VIEWPORT); - eval_ctx.scene_layer = scene_layer; + eval_ctx.view_layer = view_layer; /* Same matricies/resolution as dupli_render_particle_set(). */ unit_m4(mat); @@ -966,7 +966,7 @@ void RE_point_density_cache( void RE_point_density_minmax( struct Scene *scene, - SceneLayer *scene_layer, + ViewLayer *view_layer, struct PointDensity *pd, const bool use_render_params, float r_min[3], float r_max[3]) @@ -997,7 +997,7 @@ void RE_point_density_minmax( DAG_EVAL_VIEWPORT); eval_ctx.ctime = (float)scene->r.cfra + scene->r.subframe; - eval_ctx.scene_layer = scene_layer; + eval_ctx.view_layer = view_layer; particle_system_minmax(&eval_ctx, scene, @@ -1070,7 +1070,7 @@ static void point_density_sample_func(void *data_v, const int iter) */ void RE_point_density_sample( Scene *scene, - SceneLayer *scene_layer, + ViewLayer *view_layer, PointDensity *pd, const int resolution, const bool use_render_params, @@ -1090,7 +1090,7 @@ void RE_point_density_sample( BLI_mutex_lock(&sample_mutex); RE_point_density_minmax(scene, - scene_layer, + view_layer, pd, use_render_params, min, diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 1b19307b9e8..53169c256a9 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -264,7 +264,7 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf RenderResult *rr; RenderLayer *rl; RenderView *rv; - SceneLayer *scene_layer; + ViewLayer *view_layer; int rectx, recty; int nr; @@ -294,19 +294,19 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf render_result_views_new(rr, &re->r); /* check renderdata for amount of layers */ - for (nr = 0, scene_layer = re->render_layers.first; scene_layer; scene_layer = scene_layer->next, nr++) { + for (nr = 0, view_layer = re->view_layers.first; view_layer; view_layer = view_layer->next, nr++) { if (layername && layername[0]) - if (!STREQ(scene_layer->name, layername)) + if (!STREQ(view_layer->name, layername)) continue; if (re->r.scemode & R_SINGLE_LAYER) { - if (nr != re->active_layer) { + if (nr != re->active_view_layer) { continue; } } else { - if ((scene_layer->flag & SCENE_LAYER_RENDER) == 0) { + if ((view_layer->flag & VIEW_LAYER_RENDER) == 0) { continue; } } @@ -314,10 +314,10 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf rl = MEM_callocN(sizeof(RenderLayer), "new render layer"); BLI_addtail(&rr->layers, rl); - BLI_strncpy(rl->name, scene_layer->name, sizeof(rl->name)); - rl->layflag = scene_layer->layflag; - rl->passflag = scene_layer->passflag; /* for debugging: scene_layer->passflag | SCE_PASS_RAYHITS; */ - rl->pass_xor = scene_layer->pass_xor; + BLI_strncpy(rl->name, view_layer->name, sizeof(rl->name)); + rl->layflag = view_layer->layflag; + rl->passflag = view_layer->passflag; /* for debugging: view_layer->passflag | SCE_PASS_RAYHITS; */ + rl->pass_xor = view_layer->pass_xor; rl->rectx = rectx; rl->recty = recty; @@ -352,65 +352,65 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf /* a renderlayer should always have a Combined pass*/ render_layer_add_pass(rr, rl, 4, "Combined", view, "RGBA"); - if (scene_layer->passflag & SCE_PASS_Z) + if (view_layer->passflag & SCE_PASS_Z) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 1, RE_PASSNAME_Z, view, "Z"); - if (scene_layer->passflag & SCE_PASS_VECTOR) + if (view_layer->passflag & SCE_PASS_VECTOR) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 4, RE_PASSNAME_VECTOR, view, "XYZW"); - if (scene_layer->passflag & SCE_PASS_NORMAL) + if (view_layer->passflag & SCE_PASS_NORMAL) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_NORMAL, view, "XYZ"); - if (scene_layer->passflag & SCE_PASS_UV) + if (view_layer->passflag & SCE_PASS_UV) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_UV, view, "UVA"); - if (scene_layer->passflag & SCE_PASS_RGBA) + if (view_layer->passflag & SCE_PASS_RGBA) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 4, RE_PASSNAME_RGBA, view, "RGBA"); - if (scene_layer->passflag & SCE_PASS_EMIT) + if (view_layer->passflag & SCE_PASS_EMIT) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_EMIT, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_DIFFUSE) + if (view_layer->passflag & SCE_PASS_DIFFUSE) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_DIFFUSE, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_SPEC) + if (view_layer->passflag & SCE_PASS_SPEC) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_SPEC, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_AO) + if (view_layer->passflag & SCE_PASS_AO) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_AO, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_ENVIRONMENT) + if (view_layer->passflag & SCE_PASS_ENVIRONMENT) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_ENVIRONMENT, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_INDIRECT) + if (view_layer->passflag & SCE_PASS_INDIRECT) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_INDIRECT, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_SHADOW) + if (view_layer->passflag & SCE_PASS_SHADOW) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_SHADOW, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_REFLECT) + if (view_layer->passflag & SCE_PASS_REFLECT) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_REFLECT, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_REFRACT) + if (view_layer->passflag & SCE_PASS_REFRACT) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_REFRACT, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_INDEXOB) + if (view_layer->passflag & SCE_PASS_INDEXOB) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 1, RE_PASSNAME_INDEXOB, view, "X"); - if (scene_layer->passflag & SCE_PASS_INDEXMA) + if (view_layer->passflag & SCE_PASS_INDEXMA) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 1, RE_PASSNAME_INDEXMA, view, "X"); - if (scene_layer->passflag & SCE_PASS_MIST) + if (view_layer->passflag & SCE_PASS_MIST) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 1, RE_PASSNAME_MIST, view, "Z"); if (rl->passflag & SCE_PASS_RAYHITS) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 4, RE_PASSNAME_RAYHITS, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_DIFFUSE_DIRECT) + if (view_layer->passflag & SCE_PASS_DIFFUSE_DIRECT) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_DIFFUSE_DIRECT, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_DIFFUSE_INDIRECT) + if (view_layer->passflag & SCE_PASS_DIFFUSE_INDIRECT) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_DIFFUSE_INDIRECT, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_DIFFUSE_COLOR) + if (view_layer->passflag & SCE_PASS_DIFFUSE_COLOR) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_DIFFUSE_COLOR, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_GLOSSY_DIRECT) + if (view_layer->passflag & SCE_PASS_GLOSSY_DIRECT) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_GLOSSY_DIRECT, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_GLOSSY_INDIRECT) + if (view_layer->passflag & SCE_PASS_GLOSSY_INDIRECT) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_GLOSSY_INDIRECT, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_GLOSSY_COLOR) + if (view_layer->passflag & SCE_PASS_GLOSSY_COLOR) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_GLOSSY_COLOR, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_TRANSM_DIRECT) + if (view_layer->passflag & SCE_PASS_TRANSM_DIRECT) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_TRANSM_DIRECT, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_TRANSM_INDIRECT) + if (view_layer->passflag & SCE_PASS_TRANSM_INDIRECT) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_TRANSM_INDIRECT, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_TRANSM_COLOR) + if (view_layer->passflag & SCE_PASS_TRANSM_COLOR) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_TRANSM_COLOR, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_SUBSURFACE_DIRECT) + if (view_layer->passflag & SCE_PASS_SUBSURFACE_DIRECT) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_SUBSURFACE_DIRECT, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_SUBSURFACE_INDIRECT) + if (view_layer->passflag & SCE_PASS_SUBSURFACE_INDIRECT) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_SUBSURFACE_INDIRECT, view, "RGB"); - if (scene_layer->passflag & SCE_PASS_SUBSURFACE_COLOR) + if (view_layer->passflag & SCE_PASS_SUBSURFACE_COLOR) RENDER_LAYER_ADD_PASS_SAFE(rr, rl, 3, RE_PASSNAME_SUBSURFACE_COLOR, view, "RGB"); #undef RENDER_LAYER_ADD_PASS_SAFE } @@ -447,7 +447,7 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf rl->layflag = 0x7FFF; /* solid ztra halo strand */ rl->passflag = SCE_PASS_COMBINED; - re->active_layer = 0; + re->active_view_layer = 0; } /* border render; calculate offset for use in compositor. compo is centralized coords */ @@ -978,7 +978,7 @@ void render_result_single_layer_begin(Render *re) /* if scemode is R_SINGLE_LAYER, at end of rendering, merge the both render results */ void render_result_single_layer_end(Render *re) { - SceneLayer *scene_layer; + ViewLayer *view_layer; RenderLayer *rlpush; RenderLayer *rl; int nr; @@ -999,12 +999,12 @@ void render_result_single_layer_end(Render *re) BLI_remlink(&re->result->layers, rl); /* reconstruct render result layers */ - for (nr = 0, scene_layer = re->render_layers.first; scene_layer; scene_layer = scene_layer->next, nr++) { - if (nr == re->active_layer) { + for (nr = 0, view_layer = re->view_layers.first; view_layer; view_layer = view_layer->next, nr++) { + if (nr == re->active_view_layer) { BLI_addtail(&re->result->layers, rl); } else { - rlpush = RE_GetRenderLayer(re->pushedresult, scene_layer->name); + rlpush = RE_GetRenderLayer(re->pushedresult, view_layer->name); if (rlpush) { BLI_remlink(&re->pushedresult->layers, rlpush); BLI_addtail(&re->result->layers, rlpush); diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index a129e64db49..c9072105dd9 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -1992,18 +1992,18 @@ void add_halo_flare(Render *re) } } -void render_internal_update_passes(RenderEngine *engine, Scene *scene, SceneLayer *scene_layer) +void render_internal_update_passes(RenderEngine *engine, Scene *scene, ViewLayer *view_layer) { int type; - RE_engine_register_pass(engine, scene, scene_layer, RE_PASSNAME_COMBINED, 4, "RGBA", SOCK_RGBA); + RE_engine_register_pass(engine, scene, view_layer, RE_PASSNAME_COMBINED, 4, "RGBA", SOCK_RGBA); #define CHECK_PASS(name, channels, chanid) \ - if (scene_layer->passflag & (SCE_PASS_ ## name)) { \ + if (view_layer->passflag & (SCE_PASS_ ## name)) { \ if (channels == 4) type = SOCK_RGBA; \ else if (channels == 3) type = SOCK_VECTOR; \ else type = SOCK_FLOAT; \ - RE_engine_register_pass(engine, scene, scene_layer, RE_PASSNAME_ ## name, channels, chanid, type); \ + RE_engine_register_pass(engine, scene, view_layer, RE_PASSNAME_ ## name, channels, chanid, type); \ } CHECK_PASS(Z, 1, "Z"); diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index ffe417487d7..1230f264b2c 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -389,8 +389,8 @@ void wm_event_do_notifiers(bContext *C) } } if (ELEM(note->category, NC_SCENE, NC_OBJECT, NC_GEOM, NC_WM)) { - SceneLayer *scene_layer = CTX_data_scene_layer(C); - ED_info_stats_clear(scene_layer); + ViewLayer *view_layer = CTX_data_view_layer(C); + ED_info_stats_clear(view_layer); WM_event_add_notifier(C, NC_SPACE | ND_SPACE_INFO, NULL); } } @@ -401,9 +401,9 @@ void wm_event_do_notifiers(bContext *C) * twice which can depgraph update the same object at once */ if (G.is_rendering == false) { /* depsgraph gets called, might send more notifiers */ - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Depsgraph *depsgraph = CTX_data_depsgraph(C); - ED_update_for_newframe(CTX_data_main(C), scene, scene_layer, depsgraph); + ED_update_for_newframe(CTX_data_main(C), scene, view_layer, depsgraph); } } } @@ -2623,9 +2623,9 @@ void wm_event_do_handlers(bContext *C) int ncfra = time * (float)FPS + 0.5f; if (ncfra != scene->r.cfra) { scene->r.cfra = ncfra; - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Depsgraph *depsgraph = CTX_data_depsgraph(C); - ED_update_for_newframe(CTX_data_main(C), scene, scene_layer, depsgraph); + ED_update_for_newframe(CTX_data_main(C), scene, view_layer, depsgraph); WM_event_add_notifier(C, NC_WINDOW, NULL); } } diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index aaaf5f8f8dd..e1e863fbf8e 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -992,7 +992,7 @@ static void wm_history_file_update(void) /* screen can be NULL */ -static ImBuf *blend_file_thumb(const bContext *C, Scene *scene, SceneLayer *scene_layer, bScreen *screen, BlendThumbnail **thumb_pt) +static ImBuf *blend_file_thumb(const bContext *C, Scene *scene, ViewLayer *view_layer, bScreen *screen, BlendThumbnail **thumb_pt) { /* will be scaled down, but gives some nice oversampling */ ImBuf *ibuf; @@ -1033,14 +1033,14 @@ static ImBuf *blend_file_thumb(const bContext *C, Scene *scene, SceneLayer *scen /* gets scaled to BLEN_THUMB_SIZE */ if (scene->camera) { ibuf = ED_view3d_draw_offscreen_imbuf_simple( - &eval_ctx, scene, scene_layer, scene->camera, + &eval_ctx, scene, view_layer, scene->camera, BLEN_THUMB_SIZE * 2, BLEN_THUMB_SIZE * 2, IB_rect, OB_SOLID, false, false, false, R_ALPHAPREMUL, 0, false, NULL, NULL, NULL, err_out); } else { ibuf = ED_view3d_draw_offscreen_imbuf( - &eval_ctx, scene, scene_layer, v3d, ar, + &eval_ctx, scene, view_layer, v3d, ar, BLEN_THUMB_SIZE * 2, BLEN_THUMB_SIZE * 2, IB_rect, false, R_ALPHAPREMUL, 0, false, NULL, NULL, NULL, err_out); @@ -1136,7 +1136,7 @@ static int wm_file_write(bContext *C, const char *filepath, int fileflags, Repor /* Main now can store a .blend thumbnail, usefull for background mode or thumbnail customization. */ main_thumb = thumb = CTX_data_main(C)->blen_thumb; if ((U.flag & USER_SAVE_PREVIEWS) && BLI_thread_is_main()) { - ibuf_thumb = blend_file_thumb(C, CTX_data_scene(C), CTX_data_scene_layer(C), CTX_wm_screen(C), &thumb); + ibuf_thumb = blend_file_thumb(C, CTX_data_scene(C), CTX_data_view_layer(C), CTX_wm_screen(C), &thumb); } /* operator now handles overwrite checks */ diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index ac3b0ef8fdf..2086ade99d2 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -214,7 +214,7 @@ static WMLinkAppendDataItem *wm_link_append_data_item_add( } static void wm_link_do( - WMLinkAppendData *lapp_data, ReportList *reports, Main *bmain, Scene *scene, SceneLayer *scene_layer, + WMLinkAppendData *lapp_data, ReportList *reports, Main *bmain, Scene *scene, ViewLayer *view_layer, const bool use_placeholders, const bool force_indirect) { Main *mainl; @@ -263,7 +263,7 @@ static void wm_link_do( } new_id = BLO_library_link_named_part_ex( - mainl, &bh, item->idcode, item->name, flag, scene, scene_layer, use_placeholders, force_indirect); + mainl, &bh, item->idcode, item->name, flag, scene, view_layer, use_placeholders, force_indirect); if (new_id) { /* If the link is successful, clear item's libs 'todo' flags. @@ -273,7 +273,7 @@ static void wm_link_do( } } - BLO_library_link_end(mainl, &bh, flag, scene, scene_layer); + BLO_library_link_end(mainl, &bh, flag, scene, view_layer); BLO_blendhandle_close(bh); } } @@ -316,7 +316,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); PropertyRNA *prop; WMLinkAppendData *lapp_data; char path[FILE_MAX_LIBEXTRA], root[FILE_MAXDIR], libname[FILE_MAX_LIBEXTRA], relname[FILE_MAX]; @@ -374,8 +374,8 @@ static int wm_link_append_exec(bContext *C, wmOperator *op) /* from here down, no error returns */ - if (scene_layer && RNA_boolean_get(op->ptr, "autoselect")) { - BKE_scene_layer_base_deselect_all(scene_layer); + if (view_layer && RNA_boolean_get(op->ptr, "autoselect")) { + BKE_view_layer_base_deselect_all(view_layer); } /* tag everything, all untagged data can be made local @@ -453,7 +453,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op) /* XXX We'd need re-entrant locking on Main for this to work... */ /* BKE_main_lock(bmain); */ - wm_link_do(lapp_data, op->reports, bmain, scene, scene_layer, false, false); + wm_link_do(lapp_data, op->reports, bmain, scene, view_layer, false, false); /* BKE_main_unlock(bmain); */ diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 7785278d77f..bb640cbafe1 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3240,7 +3240,7 @@ static const EnumPropertyItem redraw_timer_type_items[] = { static void redraw_timer_step( - bContext *C, Main *bmain, Scene *scene, SceneLayer *scene_layer, + bContext *C, Main *bmain, Scene *scene, ViewLayer *view_layer, struct Depsgraph *depsgraph, wmWindow *win, ScrArea *sa, ARegion *ar, const int type, const int cfra) @@ -3288,7 +3288,7 @@ static void redraw_timer_step( } else if (type == eRTAnimationStep) { scene->r.cfra += (cfra == scene->r.cfra) ? 1 : -1; - BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, view_layer); } else if (type == eRTAnimationPlay) { /* play anim, return on same frame as started with */ @@ -3300,7 +3300,7 @@ static void redraw_timer_step( if (scene->r.cfra > scene->r.efra) scene->r.cfra = scene->r.sfra; - BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, view_layer); redraw_timer_window_swap(C); } } @@ -3314,7 +3314,7 @@ static int redraw_timer_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = CTX_data_scene_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); wmWindow *win = CTX_wm_window(C); ScrArea *sa = CTX_wm_area(C); ARegion *ar = CTX_wm_region(C); @@ -3332,7 +3332,7 @@ static int redraw_timer_exec(bContext *C, wmOperator *op) time_start = PIL_check_seconds_timer(); for (a = 0; a < iter; a++) { - redraw_timer_step(C, bmain, scene, scene_layer, depsgraph, win, sa, ar, type, cfra); + redraw_timer_step(C, bmain, scene, view_layer, depsgraph, win, sa, ar, type, cfra); iter_steps += 1; if (time_limit != 0.0) { diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 40e904259af..ff0cebb76a3 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -314,7 +314,7 @@ double elbeemEstimateMemreq(int res, float sx, float sy, float sz, int refine, c struct Render *RE_NewRender(const char *name) RET_NULL struct Render *RE_NewSceneRender(const struct Scene *scene) RET_NULL void RE_SwapResult(struct Render *re, struct RenderResult **rr) RET_NONE -void RE_BlenderFrame(struct Render *re, struct Main *bmain, struct Scene *scene, struct SceneLayer *scene_layer, struct Object *camera_override, unsigned int lay_override, int frame, const bool write_still) RET_NONE +void RE_BlenderFrame(struct Render *re, struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer, struct Object *camera_override, unsigned int lay_override, int frame, const bool write_still) RET_NONE bool RE_WriteEnvmapResult(struct ReportList *reports, struct Scene *scene, struct EnvMap *env, const char *relpath, const char imtype, float layout[12]) RET_ZERO /* rna */ @@ -476,7 +476,7 @@ void ED_fsmenu_entry_set_path(struct FSMenuEntry *fsentry, const char *name) RET char *ED_fsmenu_entry_get_name(struct FSMenuEntry *fsentry) RET_NULL void ED_fsmenu_entry_set_name(struct FSMenuEntry *fsentry, const char *name) RET_NONE -struct PTCacheEdit *PE_get_current(struct Scene *scene, struct SceneLayer *sl, struct Object *ob) RET_NULL +struct PTCacheEdit *PE_get_current(struct Scene *scene, struct ViewLayer *sl, struct Object *ob) RET_NULL void PE_current_changed(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob) RET_NONE /* rna keymap */ @@ -516,7 +516,7 @@ bool ANIM_remove_driver(struct ReportList *reports, struct ID *id, const char rn void ED_space_image_release_buffer(struct SpaceImage *sima, struct ImBuf *ibuf, void *lock) RET_NONE struct ImBuf *ED_space_image_acquire_buffer(struct SpaceImage *sima, void **r_lock) RET_NULL void ED_space_image_get_zoom(struct SpaceImage *sima, struct ARegion *ar, float *zoomx, float *zoomy) RET_NONE -const char *ED_info_stats_string(struct Scene *scene, struct SceneLayer *sl) RET_NULL +const char *ED_info_stats_string(struct Scene *scene, struct ViewLayer *sl) RET_NULL void ED_area_tag_redraw(struct ScrArea *sa) RET_NONE void ED_area_tag_refresh(struct ScrArea *sa) RET_NONE void ED_area_newspace(struct bContext *C, struct ScrArea *sa, int type, const bool skip_ar_exit) RET_NONE @@ -538,7 +538,7 @@ void ED_node_tree_path_get_fixedbuf(struct SpaceNode *snode, char *value, int ma void ED_node_tree_start(struct SpaceNode *snode, struct bNodeTree *ntree, struct ID *id, struct ID *from) RET_NONE void ED_node_tree_push(struct SpaceNode *snode, struct bNodeTree *ntree, struct bNode *gnode) RET_NONE void ED_node_tree_pop(struct SpaceNode *snode) RET_NONE -int ED_view3d_scene_layer_set(int lay, const int *values, int *active) RET_ZERO +int ED_view3d_view_layer_set(int lay, const int *values, int *active) RET_ZERO void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *ar, bool do_clip) RET_NONE void ED_view3d_from_m4(float mat[4][4], float ofs[3], float quat[4], float *dist) RET_NONE void ED_view3d_update_viewmat(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct View3D *v3d, struct ARegion *ar, float viewmat[4][4], float winmat[4][4], const struct rcti *rect) RET_NONE @@ -548,7 +548,7 @@ void ED_node_shader_default(const struct bContext *C, struct ID *id) RET_NONE void ED_screen_animation_timer_update(struct bScreen *screen, int redraws, int refresh) RET_NONE struct bScreen *ED_screen_animation_playing(const struct wmWindowManager *wm) RET_NULL struct Scene *ED_screen_scene_find(const struct bScreen *screen, const struct wmWindowManager *wm) RET_NULL -bool ED_scene_render_layer_delete(struct Main *bmain, Scene *scene, SceneLayer *layer, ReportList *reports) RET_ZERO +bool ED_scene_view_layer_delete(struct Main *bmain, Scene *scene, ViewLayer *layer, ReportList *reports) RET_ZERO void ED_object_base_select(struct Base *base, eObjectSelect_Mode mode) RET_NONE bool ED_object_modifier_remove(struct ReportList *reports, struct Main *bmain, struct Object *ob, struct ModifierData *md) RET_ZERO struct ModifierData *ED_object_modifier_add(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, const char *name, int type) RET_ZERO @@ -596,7 +596,7 @@ int ED_mesh_mirror_spatial_table(struct Object *ob, struct BMEditMesh *em, struc float ED_rollBoneToVector(EditBone *bone, const float new_up_axis[3], const bool axis_only) RET_ZERO void ED_space_image_get_size(struct SpaceImage *sima, int *width, int *height) RET_NONE -bool ED_space_image_check_show_maskedit(struct SceneLayer *sl, struct SpaceImage *sima) RET_ZERO +bool ED_space_image_check_show_maskedit(struct ViewLayer *sl, struct SpaceImage *sima) RET_ZERO bool ED_texture_context_check_world(const struct bContext *C) RET_ZERO bool ED_texture_context_check_material(const struct bContext *C) RET_ZERO @@ -607,9 +607,9 @@ bool ED_texture_context_check_others(const struct bContext *C) RET_ZERO bool ED_text_region_location_from_cursor(SpaceText *st, ARegion *ar, const int cursor_co[2], int r_pixel_co[2]) RET_ZERO SnapObjectContext *ED_transform_snap_object_context_create( - struct Main *bmain, struct Scene *scene, struct SceneLayer *sl, struct RenderEngineType *engine, int flag) RET_NULL + struct Main *bmain, struct Scene *scene, struct ViewLayer *sl, struct RenderEngineType *engine, int flag) RET_NULL SnapObjectContext *ED_transform_snap_object_context_create_view3d( - struct Main *bmain, struct Scene *scene, struct SceneLayer *sl, struct RenderEngineType *engine, int flag, + struct Main *bmain, struct Scene *scene, struct ViewLayer *sl, struct RenderEngineType *engine, int flag, const struct ARegion *ar, const struct View3D *v3d) RET_NULL void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx) RET_NONE bool ED_transform_snap_object_project_ray_ex( @@ -758,15 +758,15 @@ void RE_engine_update_memory_stats(struct RenderEngine *engine, float mem_used, struct RenderEngine *RE_engine_create(struct RenderEngineType *type) RET_NULL void RE_engine_frame_set(struct RenderEngine *engine, int frame, float subframe) RET_NONE void RE_FreePersistentData(void) RET_NONE -void RE_point_density_cache(struct Scene *scene, struct SceneLayer *sl, struct PointDensity *pd, const bool use_render_params) RET_NONE -void RE_point_density_minmax(struct Scene *scene, struct SceneLayer *sl, struct PointDensity *pd, const bool use_render_params, float r_min[3], float r_max[3]) RET_NONE -void RE_point_density_sample(struct Scene *scene, struct SceneLayer *sl, struct PointDensity *pd, const int resolution, const bool use_render_params, float *values) RET_NONE +void RE_point_density_cache(struct Scene *scene, struct ViewLayer *sl, struct PointDensity *pd, const bool use_render_params) RET_NONE +void RE_point_density_minmax(struct Scene *scene, struct ViewLayer *sl, struct PointDensity *pd, const bool use_render_params, float r_min[3], float r_max[3]) RET_NONE +void RE_point_density_sample(struct Scene *scene, struct ViewLayer *sl, struct PointDensity *pd, const int resolution, const bool use_render_params, float *values) RET_NONE void RE_point_density_free(struct PointDensity *pd) RET_NONE void RE_instance_get_particle_info(struct ObjectInstanceRen *obi, float *index, float *age, float *lifetime, float co[3], float *size, float vel[3], float angvel[3]) RET_NONE void RE_FreeAllPersistentData(void) RET_NONE float RE_fresnel_dielectric(float incoming[3], float normal[3], float eta) RET_ZERO -void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, struct SceneLayer *scene_layer, const char *name, int channels, const char *chanid, int type) RET_NONE -struct SceneLayer *RE_engine_get_scene_layer(struct Render *re) RET_NULL +void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer, const char *name, int channels, const char *chanid, int type) RET_NONE +struct ViewLayer *RE_engine_get_view_layer(struct Render *re) RET_NULL void RE_SetDepsgraph(struct Render *re, struct Depsgraph *graph) RET_NONE /* Draw */ @@ -819,7 +819,7 @@ int UI_pie_menu_invoke_from_operator_enum(struct bContext *C, const char *title, /* RNA COLLADA dependency */ int collada_export(const struct EvaluationContext *eval_ctx, struct Scene *sce, - struct SceneLayer *scene_layer, + struct ViewLayer *view_layer, const char *filepath, int apply_modifiers, BC_export_mesh_type export_mesh_type, diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 4b92c5fde5b..6b47d7c3474 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -440,9 +440,9 @@ static void render_set_depgraph(bContext *C, Render *re) * Apparently, CTX_data_layer is crashing here (context's layer * is NULL for old files, and there is no workspace). */ - SceneLayer *scene_layer = scene->render_layers.first; - Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, scene_layer, true); - DEG_graph_relations_update(depsgraph, bmain, scene, scene_layer); + ViewLayer *view_layer = scene->view_layers.first; + Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true); + DEG_graph_relations_update(depsgraph, bmain, scene, view_layer); DEG_graph_on_visible_update(bmain, depsgraph); RE_SetDepsgraph(re, depsgraph); diff --git a/tests/gtests/alembic/abc_export_test.cc b/tests/gtests/alembic/abc_export_test.cc index 2e4d95f6f60..b040f375221 100644 --- a/tests/gtests/alembic/abc_export_test.cc +++ b/tests/gtests/alembic/abc_export_test.cc @@ -16,9 +16,9 @@ extern "C" { class TestableAbcExporter : public AbcExporter { public: TestableAbcExporter(Main *bmain, EvaluationContext *eval_ctx, - Scene *scene, SceneLayer *scene_layer, Depsgraph *depsgraph, + Scene *scene, ViewLayer *view_layer, Depsgraph *depsgraph, const char *filename, ExportSettings &settings) - : AbcExporter(bmain, eval_ctx, scene, scene_layer, depsgraph, filename, settings) + : AbcExporter(bmain, eval_ctx, scene, view_layer, depsgraph, filename, settings) { } @@ -73,8 +73,8 @@ protected: // Call after setting up the settings. void createExporter() { - SceneLayer *scene_layer = (SceneLayer *)scene.render_layers.first; - exporter = new TestableAbcExporter(bmain, &eval_ctx, &scene, scene_layer, depsgraph, "somefile.abc", settings); + ViewLayer *view_layer = (ViewLayer *)scene.view_layers.first; + exporter = new TestableAbcExporter(bmain, &eval_ctx, &scene, view_layer, depsgraph, "somefile.abc", settings); } }; 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 |