diff options
| author | Julian Eisel <julian@blender.org> | 2021-01-13 17:08:09 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-01-13 17:31:02 +0300 |
| commit | 2771dfd5632ad6d982ee4bf3e87decdb197ebed7 (patch) | |
| tree | 515ef4f88aaf9ad2a3873ba9dec5133317703d18 /source/blender/makesrna/intern/rna_ui_api.c | |
| parent | ad4202a14fbce95b7c40df0e815c1ac261515b05 (diff) | |
UI: Revert design changes to data-block selector for the 2.92 release
Partially reverts 2250b5cefee7.
Removing the user count and fake user count icons was controversial (which was
expected) and there are a few further changes needed, that won't make it in
time for the release, see D9946.
While there is a design to bring back the user count and fake user indicators,
a new design idea was proposed that the UI team wants to follow. This came too
late for the 2.92 release, the new design is targeted at the 2.93 release now.
Meanwhile, UI team decision was to simply revert the design changes.
The new design is being worked on in https://developer.blender.org/T84669.
Note that this commit does not revert some internal changes done in
2250b5cefee7. Namely the introduction of `ed_util_ops.c` and data-block
operators in there. These will still be needed in the new design.
Diffstat (limited to 'source/blender/makesrna/intern/rna_ui_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_ui_api.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index e26cc8d8d41..447f5b4210b 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -480,7 +480,6 @@ static void rna_uiTemplateID(uiLayout *layout, PointerRNA *ptr, const char *propname, const char *newop, - const char *duplicateop, const char *openop, const char *unlinkop, int filter, @@ -499,8 +498,7 @@ static void rna_uiTemplateID(uiLayout *layout, /* Get translated name (label). */ name = rna_translate_ui_text(name, text_ctxt, NULL, prop, translate); - uiTemplateID( - layout, C, ptr, propname, newop, duplicateop, openop, unlinkop, filter, live_icon, name); + uiTemplateID(layout, C, ptr, propname, newop, openop, unlinkop, filter, live_icon, name); } static void rna_uiTemplateAnyID(uiLayout *layout, @@ -1158,11 +1156,8 @@ void RNA_api_ui_layout(StructRNA *srna) api_ui_item_rna_common(func); RNA_def_string(func, "new", NULL, 0, "", "Operator identifier to create a new ID block"); RNA_def_string( - func, "duplicate", NULL, 0, "", "Operator identifier to duplicate the selected ID block"); - RNA_def_string( func, "open", NULL, 0, "", "Operator identifier to open a file for creating a new ID block"); - RNA_def_string( - func, "unlink", NULL, 0, "", "Operator identifier to unlink the selected ID block"); + RNA_def_string(func, "unlink", NULL, 0, "", "Operator identifier to unlink the ID block"); RNA_def_enum(func, "filter", id_template_filter_items, |