diff options
Diffstat (limited to 'source/blender/editors/interface/interface.c')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 18666daa8b8..9ec660a9714 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1299,9 +1299,8 @@ static bool ui_but_event_property_operator_string(const bContext *C, } else if (GS(id->name) == ID_SCE) { if (RNA_struct_is_a(ptr->type, &RNA_ToolSettings)) { - /* toolsettings property - * NOTE: toolsettings is usually accessed directly (i.e. not through scene) - */ + /* Tool-settings property: + * NOTE: tool-settings is usually accessed directly (i.e. not through scene). */ data_path = RNA_path_from_ID_to_property(ptr, prop); } else { @@ -6333,7 +6332,9 @@ uiBut *uiDefSearchBut(uiBlock *block, /** * \param search_func, bfunc: both get it as \a arg. * \param arg: user value, - * \param active: when set, button opens with this item visible and selected. + * \param active: when set, button opens with this item visible and selected. + * \param separator_string: when not NULL, this string is used as a separator, + * showing the icon and highlighted text after the last instance of this string. */ void UI_but_func_search_set(uiBut *but, uiButSearchCreateFunc search_create_func, @@ -6341,6 +6342,7 @@ void UI_but_func_search_set(uiBut *but, void *arg, uiButSearchArgFreeFunc search_arg_free_func, uiButHandleFunc bfunc, + const char *search_sep_string, void *active) { /* needed since callers don't have access to internal functions @@ -6359,6 +6361,7 @@ void UI_but_func_search_set(uiBut *but, but->search_arg = arg; but->search_arg_free_func = search_arg_free_func; + but->search_sep_string = search_sep_string; if (bfunc) { #ifdef DEBUG @@ -6468,6 +6471,7 @@ uiBut *uiDefSearchButO_ptr(uiBlock *block, but, NULL, operator_enum_call_cb, + NULL, NULL); but->optype = ot; |