diff options
| author | Ines Almeida <britalmeida@gmail.com> | 2018-10-13 20:49:26 +0300 |
|---|---|---|
| committer | Ines Almeida <britalmeida@gmail.com> | 2018-10-13 20:49:26 +0300 |
| commit | ab62b7e971ab446c8c286fac305a846f83161e50 (patch) | |
| tree | 7fd5a67b9653e2e10efee94374e812e76da86a05 /source/blender/editors/interface/interface_region_search.c | |
| parent | cc8424e73324b772621045c1856f9a8869faa859 (diff) | |
| parent | dd6bf3f84a9137affbcd8ba0fc957c32b8c0aff7 (diff) | |
Merge branch 'origin/blender2.8' into temp-ui-layout-2.8temp-ui-layout-2.8
Diffstat (limited to 'source/blender/editors/interface/interface_region_search.c')
| -rw-r--r-- | source/blender/editors/interface/interface_region_search.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_region_search.c b/source/blender/editors/interface/interface_region_search.c index d262cbc38bd..471055ed24a 100644 --- a/source/blender/editors/interface/interface_region_search.c +++ b/source/blender/editors/interface/interface_region_search.c @@ -533,8 +533,9 @@ ARegion *ui_searchbox_create_generic(bContext *C, ARegion *butregion, uiBut *but data->prv_cols = but->a2; } - /* only show key shortcuts when needed (not rna buttons) [#36699] */ - if (but->rnaprop == NULL) { + /* Only show key shortcuts when needed (checking RNA prop pointer is useless here, a lot of buttons are about data + * without having that pointer defined, let's rather try with optype!). */ + if (but->optype != NULL) { data->use_sep = true; } |