From 3abe8b3292cf7a50a9200b95401993384df24d9a Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 22 Nov 2017 10:52:39 -0200 Subject: Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927 --- source/blender/makesrna/intern/makesrna.c | 2 +- source/blender/makesrna/intern/rna_brush.c | 12 +- source/blender/makesrna/intern/rna_context.c | 10 +- source/blender/makesrna/intern/rna_internal.h | 14 +- source/blender/makesrna/intern/rna_layer.c | 278 +++++++++++----------- source/blender/makesrna/intern/rna_main_api.c | 16 +- source/blender/makesrna/intern/rna_nodetree.c | 34 +-- source/blender/makesrna/intern/rna_object_api.c | 26 +- source/blender/makesrna/intern/rna_object_force.c | 2 +- source/blender/makesrna/intern/rna_particle.c | 6 +- source/blender/makesrna/intern/rna_render.c | 24 +- source/blender/makesrna/intern/rna_scene.c | 224 ++++++++--------- source/blender/makesrna/intern/rna_scene_api.c | 28 +-- source/blender/makesrna/intern/rna_sculpt_paint.c | 42 ++-- source/blender/makesrna/intern/rna_space.c | 22 +- source/blender/makesrna/intern/rna_texture.c | 4 +- source/blender/makesrna/intern/rna_workspace.c | 20 +- 17 files changed, 382 insertions(+), 382 deletions(-) (limited to 'source/blender/makesrna/intern') 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); -- cgit v1.2.3