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 /release | |
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 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_material.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_world.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_dopesheet.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py index e1f2862f826..47ab98386f4 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -133,7 +133,7 @@ class EEVEE_MATERIAL_PT_context_material(MaterialButtonsPanel, Panel): row = layout.row() if ob: - row.template_ID(ob, "active_material", new="material.new", duplicate="material.duplicate") + row.template_ID(ob, "active_material", new="material.new") if slot: icon_link = 'MESH_DATA' if slot.link == 'DATA' else 'OBJECT_DATA' diff --git a/release/scripts/startup/bl_ui/properties_world.py b/release/scripts/startup/bl_ui/properties_world.py index 74293e02b60..9b61311c2d3 100644 --- a/release/scripts/startup/bl_ui/properties_world.py +++ b/release/scripts/startup/bl_ui/properties_world.py @@ -51,7 +51,7 @@ class WORLD_PT_context_world(WorldButtonsPanel, Panel): space = context.space_data if scene: - layout.template_ID(scene, "world", new="world.new", duplicate="world.duplicate") + layout.template_ID(scene, "world", new="world.new") elif world: layout.template_ID(space, "pin_id") diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index 3f43240eaed..0c222e8c023 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -248,7 +248,7 @@ class DOPESHEET_HT_editor_buttons: layout.separator_spacer() - layout.template_ID(st, "action", new="action.new", duplicate="action.duplicate_assign", unlink="action.unlink") + layout.template_ID(st, "action", new="action.new", unlink="action.unlink") # Layer management if st.mode == 'GPENCIL': |