Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2020-12-19 02:13:15 +0300
committerHans Goudey <h.goudey@me.com>2020-12-19 02:13:15 +0300
commit6942dd9f49003ead61f9a0e52b398ebc74a5e3cb (patch)
treebd1cf16233fb7004889d40d24ad7f08be08e5919 /source/blender/makesrna/intern/rna_ui.c
parent002722bb800e5b5d5d7e1c54e92e7d66037cb891 (diff)
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
Diffstat (limited to 'source/blender/makesrna/intern/rna_ui.c')
-rw-r--r--source/blender/makesrna/intern/rna_ui.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c
index 51cc178ab15..b86f5b789da 100644
--- a/source/blender/makesrna/intern/rna_ui.c
+++ b/source/blender/makesrna/intern/rna_ui.c
@@ -1200,6 +1200,11 @@ static void rna_def_ui_layout(BlenderRNA *brna)
{UI_EMBOSS_NONE, "NONE", 0, "None", "Draw only text and icons"},
{UI_EMBOSS_PULLDOWN, "PULLDOWN_MENU", 0, "Pulldown Menu", "Draw pulldown menu style"},
{UI_EMBOSS_RADIAL, "RADIAL_MENU", 0, "Radial Menu", "Draw radial menu style"},
+ {UI_EMBOSS_NONE_OR_STATUS,
+ "UI_EMBOSS_NONE_OR_STATUS",
+ 0,
+ "None or Status",
+ "Draw with no emboss unless the button has a coloring status like an animation state"},
{0, NULL, 0, NULL, NULL},
};