diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 15:52:39 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-23 12:48:23 +0300 |
commit | 3abe8b3292cf7a50a9200b95401993384df24d9a (patch) | |
tree | 6c7a853710f1a4264dd1bb4d7b9bf14f44b75f33 /source/blender/editors/render/render_shading.c | |
parent | fb7d23bdb2a5c0ed00067045e4acdf6593258b52 (diff) |
Rename any instance of scene layer or render layer in code with view layer
The RenderResult struct still has a listbase of RenderLayer, but that's ok
since this is strictly for rendering.
* Subversion bump (to 2.80.2)
* DNA low level doversion (renames) - only for .blend created since 2.80 started
Note: We can't use DNA_struct_elem_find or get file version in init_structDNA,
so we are manually iterating over the array of the SDNA elements instead.
Note 2: This doversion change with renames can be reverted in a few months. But
so far it's required for 2.8 files created between October 2016 and now.
Reviewers: campbellbarton, sergey
Differential Revision: https://developer.blender.org/D2927
Diffstat (limited to 'source/blender/editors/render/render_shading.c')
-rw-r--r-- | source/blender/editors/render/render_shading.c | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index a98751176fc..04604feab6a 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -624,12 +624,12 @@ void WORLD_OT_new(wmOperatorType *ot) /********************** render layer operators *********************/ -static int render_layer_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int view_layer_add_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - BKE_scene_layer_add(scene, NULL); - scene->active_layer = BLI_listbase_count(&scene->render_layers) - 1; + BKE_view_layer_add(scene, NULL); + scene->active_view_layer = BLI_listbase_count(&scene->view_layers) - 1; DEG_id_tag_update(&scene->id, 0); DEG_relations_tag_update(CTX_data_main(C)); @@ -638,27 +638,27 @@ static int render_layer_add_exec(bContext *C, wmOperator *UNUSED(op)) return OPERATOR_FINISHED; } -void SCENE_OT_render_layer_add(wmOperatorType *ot) +void SCENE_OT_view_layer_add(wmOperatorType *ot) { /* identifiers */ - ot->name = "Add Render Layer"; - ot->idname = "SCENE_OT_render_layer_add"; - ot->description = "Add a render layer"; + ot->name = "Add View Layer"; + ot->idname = "SCENE_OT_view_layer_add"; + ot->description = "Add a view layer"; /* api callbacks */ - ot->exec = render_layer_add_exec; + ot->exec = view_layer_add_exec; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL; } -static int render_layer_remove_exec(bContext *C, wmOperator *UNUSED(op)) +static int view_layer_remove_exec(bContext *C, wmOperator *UNUSED(op)) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BKE_scene_layer_from_scene_get(scene); + ViewLayer *view_layer = BKE_view_layer_from_scene_get(scene); - if (!ED_scene_render_layer_delete(bmain, scene, scene_layer, NULL)) { + if (!ED_scene_view_layer_delete(bmain, scene, view_layer, NULL)) { return OPERATOR_CANCELLED; } @@ -667,15 +667,15 @@ static int render_layer_remove_exec(bContext *C, wmOperator *UNUSED(op)) return OPERATOR_FINISHED; } -void SCENE_OT_render_layer_remove(wmOperatorType *ot) +void SCENE_OT_view_layer_remove(wmOperatorType *ot) { /* identifiers */ - ot->name = "Remove Render Layer"; - ot->idname = "SCENE_OT_render_layer_remove"; - ot->description = "Remove the selected render layer"; + ot->name = "Remove View Layer"; + ot->idname = "SCENE_OT_view_layer_remove"; + ot->description = "Remove the selected view layer"; /* api callbacks */ - ot->exec = render_layer_remove_exec; + ot->exec = view_layer_remove_exec; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL; @@ -772,9 +772,9 @@ static int freestyle_active_module_poll(bContext *C) static int freestyle_module_add_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); - BKE_freestyle_module_add(&scene_layer->freestyle_config); + BKE_freestyle_module_add(&view_layer->freestyle_config); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); @@ -798,11 +798,11 @@ void SCENE_OT_freestyle_module_add(wmOperatorType *ot) static int freestyle_module_remove_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); PointerRNA ptr = CTX_data_pointer_get_type(C, "freestyle_module", &RNA_FreestyleModuleSettings); FreestyleModuleConfig *module = ptr.data; - BKE_freestyle_module_delete(&scene_layer->freestyle_config, module); + BKE_freestyle_module_delete(&view_layer->freestyle_config, module); DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); @@ -828,12 +828,12 @@ void SCENE_OT_freestyle_module_remove(wmOperatorType *ot) static int freestyle_module_move_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); PointerRNA ptr = CTX_data_pointer_get_type(C, "freestyle_module", &RNA_FreestyleModuleSettings); FreestyleModuleConfig *module = ptr.data; int dir = RNA_enum_get(op->ptr, "direction"); - if (BKE_freestyle_module_move(&scene_layer->freestyle_config, module, dir)) { + if (BKE_freestyle_module_move(&view_layer->freestyle_config, module, dir)) { DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); } @@ -870,9 +870,9 @@ static int freestyle_lineset_add_exec(bContext *C, wmOperator *UNUSED(op)) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); - BKE_freestyle_lineset_add(bmain, &scene_layer->freestyle_config, NULL); + BKE_freestyle_lineset_add(bmain, &view_layer->freestyle_config, NULL); DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); @@ -897,21 +897,21 @@ void SCENE_OT_freestyle_lineset_add(wmOperatorType *ot) static int freestyle_active_lineset_poll(bContext *C) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); - if (!scene_layer) { + if (!view_layer) { return false; } - return BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config) != NULL; + return BKE_freestyle_lineset_get_active(&view_layer->freestyle_config) != NULL; } static int freestyle_lineset_copy_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); - FRS_copy_active_lineset(&scene_layer->freestyle_config); + FRS_copy_active_lineset(&view_layer->freestyle_config); return OPERATOR_FINISHED; } @@ -934,9 +934,9 @@ void SCENE_OT_freestyle_lineset_copy(wmOperatorType *ot) static int freestyle_lineset_paste_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); - FRS_paste_active_lineset(&scene_layer->freestyle_config); + FRS_paste_active_lineset(&view_layer->freestyle_config); DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); @@ -962,9 +962,9 @@ void SCENE_OT_freestyle_lineset_paste(wmOperatorType *ot) static int freestyle_lineset_remove_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); - FRS_delete_active_lineset(&scene_layer->freestyle_config); + FRS_delete_active_lineset(&view_layer->freestyle_config); DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); @@ -990,10 +990,10 @@ void SCENE_OT_freestyle_lineset_remove(wmOperatorType *ot) static int freestyle_lineset_move_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); int dir = RNA_enum_get(op->ptr, "direction"); - if (FRS_move_active_lineset(&scene_layer->freestyle_config, dir)) { + if (FRS_move_active_lineset(&view_layer->freestyle_config, dir)) { DEG_id_tag_update(&scene->id, 0); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); } @@ -1030,8 +1030,8 @@ static int freestyle_linestyle_new_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); if (!lineset) { BKE_report(op->reports, RPT_ERROR, "No active lineset to add a new line style to"); @@ -1068,8 +1068,8 @@ void SCENE_OT_freestyle_linestyle_new(wmOperatorType *ot) static int freestyle_color_modifier_add_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); int type = RNA_enum_get(op->ptr, "type"); if (!freestyle_linestyle_check_report(lineset, op->reports)) { @@ -1108,8 +1108,8 @@ void SCENE_OT_freestyle_color_modifier_add(wmOperatorType *ot) static int freestyle_alpha_modifier_add_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); int type = RNA_enum_get(op->ptr, "type"); if (!freestyle_linestyle_check_report(lineset, op->reports)) { @@ -1148,8 +1148,8 @@ void SCENE_OT_freestyle_alpha_modifier_add(wmOperatorType *ot) static int freestyle_thickness_modifier_add_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); int type = RNA_enum_get(op->ptr, "type"); if (!freestyle_linestyle_check_report(lineset, op->reports)) { @@ -1188,8 +1188,8 @@ void SCENE_OT_freestyle_thickness_modifier_add(wmOperatorType *ot) static int freestyle_geometry_modifier_add_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); int type = RNA_enum_get(op->ptr, "type"); if (!freestyle_linestyle_check_report(lineset, op->reports)) { @@ -1241,8 +1241,8 @@ static int freestyle_get_modifier_type(PointerRNA *ptr) static int freestyle_modifier_remove_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_LineStyleModifier); LineStyleModifier *modifier = ptr.data; @@ -1291,8 +1291,8 @@ void SCENE_OT_freestyle_modifier_remove(wmOperatorType *ot) static int freestyle_modifier_copy_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_LineStyleModifier); LineStyleModifier *modifier = ptr.data; @@ -1341,8 +1341,8 @@ void SCENE_OT_freestyle_modifier_copy(wmOperatorType *ot) static int freestyle_modifier_move_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer); - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&scene_layer->freestyle_config); + ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer); + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(&view_layer->freestyle_config); PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_LineStyleModifier); LineStyleModifier *modifier = ptr.data; int dir = RNA_enum_get(op->ptr, "direction"); |