diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-01 21:15:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-01 21:15:21 +0300 |
| commit | 37994e0af2cf6f0d7ed8a072eb765dfb022ceaef (patch) | |
| tree | 07ea3a893aa2dc586f22a46681aa77c430f63317 /source/blender/editors/interface/interface_query.c | |
| parent | 192e5d65a746798f6bddf897570ff8aba55c9c5a (diff) | |
| parent | 26c5a1c301d3d554c4b1244b219f9883249f382d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/interface_query.c')
| -rw-r--r-- | source/blender/editors/interface/interface_query.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/editors/interface/interface_query.c b/source/blender/editors/interface/interface_query.c index bdd2de05ab4..66f63fef82d 100644 --- a/source/blender/editors/interface/interface_query.c +++ b/source/blender/editors/interface/interface_query.c @@ -41,16 +41,18 @@ bool ui_but_is_editable(const uiBut *but) { - return !ELEM(but->type, - UI_BTYPE_LABEL, UI_BTYPE_SEPR, UI_BTYPE_SEPR_LINE, - UI_BTYPE_ROUNDBOX, UI_BTYPE_LISTBOX, UI_BTYPE_PROGRESS_BAR); + return !ELEM( + but->type, + UI_BTYPE_LABEL, UI_BTYPE_SEPR, UI_BTYPE_SEPR_LINE, + UI_BTYPE_ROUNDBOX, UI_BTYPE_LISTBOX, UI_BTYPE_PROGRESS_BAR); } bool ui_but_is_editable_as_text(const uiBut *but) { - return ELEM(but->type, - UI_BTYPE_TEXT, UI_BTYPE_NUM, UI_BTYPE_NUM_SLIDER, - UI_BTYPE_SEARCH_MENU); + return ELEM( + but->type, + UI_BTYPE_TEXT, UI_BTYPE_NUM, UI_BTYPE_NUM_SLIDER, + UI_BTYPE_SEARCH_MENU); } |