From 839bf119c1a774b47583db098ed6fd1fc4bb34c6 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Fri, 5 May 2017 00:44:06 +0200 Subject: Revert "Add red alert in UI controls for datablock pointer properties" This reverts commit f5bc8ad4ce87165fc0648f1cd8c0ae1fb5f07281. We agreed there needs to be a better solution for this, see comments in rBf5bc8ad4ce87165. --- source/blender/editors/interface/interface_regions.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'source/blender/editors/interface/interface_regions.c') diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 0d9d8c4f887..534bd4278ca 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -811,11 +811,11 @@ int UI_searchbox_size_x(void) return 12 * UI_UNIT_X; } -int UI_search_items_find_index(uiSearchItems *items, const char *name, const size_t offset) +int UI_search_items_find_index(uiSearchItems *items, const char *name) { int i; for (i = 0; i < items->totitem; i++) { - if (STREQ(name, items->names[i] + offset)) { + if (STREQ(name, items->names[i])) { return i; } } @@ -894,7 +894,7 @@ static void ui_searchbox_butrect(rcti *r_rect, uiSearchboxData *data, int itemnr int ui_searchbox_find_index(ARegion *ar, const char *name) { uiSearchboxData *data = ar->regiondata; - return UI_search_items_find_index(&data->items, name, 0); + return UI_search_items_find_index(&data->items, name); } /* x and y in screencoords */ @@ -1420,14 +1420,14 @@ void ui_searchbox_free(bContext *C, ARegion *ar) /* sets red alert if button holds a string it can't find */ /* XXX weak: search_func adds all partial matches... */ -void ui_but_search_refresh(uiBut *but, const bool is_template_ID) +void ui_but_search_refresh(uiBut *but) { uiSearchItems *items; int x1; - /* possibly very large lists (such as ID datablocks), - * only validate string and pointer RNA buts */ - if (but->rnaprop && !ELEM(RNA_property_type(but->rnaprop), PROP_STRING, PROP_POINTER)) { + /* possibly very large lists (such as ID datablocks) only + * only validate string RNA buts (not pointers) */ + if (but->rnaprop && RNA_property_type(but->rnaprop) != PROP_STRING) { return; } @@ -1447,8 +1447,7 @@ void ui_but_search_refresh(uiBut *but, const bool is_template_ID) UI_but_flag_enable(but, UI_BUT_REDALERT); } else if (items->more == 0) { - const size_t offset = is_template_ID ? 3 : 0; - if (UI_search_items_find_index(items, but->drawstr, offset) == -1) { + if (UI_search_items_find_index(items, but->drawstr) == -1) { UI_but_flag_enable(but, UI_BUT_REDALERT); } } -- cgit v1.2.3