diff options
author | Chris Clyne <lateasusual> | 2020-03-26 21:33:27 +0300 |
---|---|---|
committer | Bastien Montagne <b.mont29@gmail.com> | 2020-03-26 21:36:51 +0300 |
commit | d1972e50cbef6e2a40ffc259f10e08493511dc66 (patch) | |
tree | 1a32794c1c85fef8bc1307ecd7fb2ad562c20b91 /source/blender/editors/render | |
parent | 839f0cfa41f2f209774b3a7d222529954a788466 (diff) |
Add option to Copy the active view layer, and add an empty view layer
Modify the view layer add operator (and underlying `BKE_view_layer_add`)
to allow for copying the current view layer, as well as adding a new one
but with all LayerCollections disabled by default (this is important for
heavy scenes where currently adding view layers can take a long time due
to enabling every collection by default).
Reviewed By: mont29
Differential Revision: https://developer.blender.org/D6862
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r-- | source/blender/editors/render/render_shading.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 62a078bedb7..e1fa4caafbd 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -814,14 +814,16 @@ void WORLD_OT_new(wmOperatorType *ot) /********************** render layer operators *********************/ -static int view_layer_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int view_layer_add_exec(bContext *C, wmOperator *op) { wmWindow *win = CTX_wm_window(C); Scene *scene = CTX_data_scene(C); - ViewLayer *view_layer = BKE_view_layer_add(scene, NULL); + ViewLayer *view_layer_current = WM_window_get_active_view_layer(win); + ViewLayer *view_layer_new = BKE_view_layer_add( + scene, view_layer_current->name, view_layer_current, RNA_enum_get(op->ptr, "type")); if (win) { - WM_window_set_active_view_layer(win, view_layer); + WM_window_set_active_view_layer(win, view_layer_new); } DEG_id_tag_update(&scene->id, 0); @@ -833,6 +835,17 @@ static int view_layer_add_exec(bContext *C, wmOperator *UNUSED(op)) void SCENE_OT_view_layer_add(wmOperatorType *ot) { + static EnumPropertyItem type_items[] = { + {VIEWLAYER_ADD_NEW, "NEW", 0, "New", "Add a new view layer"}, + {VIEWLAYER_ADD_COPY, "COPY", 0, "Copy Settings", "Copy settings of current view layer"}, + {VIEWLAYER_ADD_EMPTY, + "EMPTY", + 0, + "Blank", + "Add a new view layer with all collections disabled"}, + {0, NULL, 0, NULL, NULL}, + }; + /* identifiers */ ot->name = "Add View Layer"; ot->idname = "SCENE_OT_view_layer_add"; @@ -840,9 +853,13 @@ void SCENE_OT_view_layer_add(wmOperatorType *ot) /* api callbacks */ ot->exec = view_layer_add_exec; + ot->invoke = WM_menu_invoke; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL; + + /* properties */ + ot->prop = RNA_def_enum(ot->srna, "type", type_items, 0, "Type", ""); } static bool view_layer_remove_poll(bContext *C) |