diff options
author | Campbell Barton <campbell@blender.org> | 2022-05-20 09:46:52 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-05-20 09:46:52 +0300 |
commit | af7502dd9b9538cdf6439daba7c7cec12d371e37 (patch) | |
tree | ccf8c3d2df0307e486568dc2a9de68143d9087ae /source | |
parent | f0495919676da0ae9b7923fc8cbd512443c940b1 (diff) | |
parent | d27f4e84931798b4366a8058904dd967420a999c (diff) |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/interface/interface_region_menu_popup.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_region_menu_popup.cc b/source/blender/editors/interface/interface_region_menu_popup.cc index e843a275d08..a22f7218203 100644 --- a/source/blender/editors/interface/interface_region_menu_popup.cc +++ b/source/blender/editors/interface/interface_region_menu_popup.cc @@ -129,6 +129,12 @@ static uiBut *ui_popup_menu_memory__internal(uiBlock *block, uiBut *but) /* get */ LISTBASE_FOREACH (uiBut *, but_iter, &block->buttons) { + /* Prevent labels (typically headings), from being returned in the case the text + * happens to matches one of the menu items. + * Skip separators too as checking them is redundant. */ + if (ELEM(but_iter->type, UI_BTYPE_LABEL, UI_BTYPE_SEPR, UI_BTYPE_SEPR_LINE)) { + continue; + } if (mem[hash_mod] == ui_popup_string_hash(but_iter->str, but_iter->flag & UI_BUT_HAS_SEP_CHAR)) { return but_iter; |