From 6942dd9f49003ead61f9a0e52b398ebc74a5e3cb Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Fri, 18 Dec 2020 17:13:15 -0600 Subject: Fix T83868: Button animation states no longer visible without emboss This bug was caused by making it so that non-embossed modifier icon buttons could become an operator button and retain their red highlight for disabled modifiers. The icon button needs emboss turned off, but in earlier versions of Blender, `UI_EMBOSS_NONE` would be overridden by animation or red alert states. Instead of abusing "NONE" to mean "none unless there is animation or red alert", this commit adds a new emboss flag for that situation, `UI_EMBOSS_NONE_OR_STATUS`, which uses no emboss unless there is an animation state, or another status. There are only a few situations where this is necessary, so the change isn't too big. Differential Revision: https://developer.blender.org/D9902 --- release/scripts/startup/bl_ui/properties_data_mesh.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'release/scripts/startup/bl_ui') diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index 924a89755f8..a9d7b8d71f3 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -117,12 +117,13 @@ class MESH_UL_shape_keys(UIList): split = layout.split(factor=0.66, align=False) split.prop(key_block, "name", text="", emboss=False, icon_value=icon) row = split.row(align=True) + row.emboss = 'UI_EMBOSS_NONE_OR_STATUS' if key_block.mute or (obj.mode == 'EDIT' and not (obj.use_shape_key_edit_mode and obj.type == 'MESH')): row.active = False if not item.id_data.use_relative: - row.prop(key_block, "frame", text="", emboss=False) + row.prop(key_block, "frame", text="") elif index > 0: - row.prop(key_block, "value", text="", emboss=False) + row.prop(key_block, "value", text="") else: row.label(text="") row.prop(key_block, "mute", text="", emboss=False) -- cgit v1.2.3