diff options
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_utils.c | 14 |
2 files changed, 5 insertions, 13 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 0d7dbd0d441..0d2a7248a2e 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -295,8 +295,8 @@ static bool id_search_add( } if (*str == '\0' || BLI_strcasestr(id->name + 2, str)) { - /* +1 is needed because BKE_id_ui_prefix uses 3 letter prefix - * followed by ID_NAME-2 characters from id->name. + /* +1 is needed because BKE_id_ui_prefix used 3 letter prefix + * followed by ID_NAME-2 characters from id->name */ char name_ui[MAX_ID_FULL_NAME]; BKE_id_full_name_ui_prefix_get(name_ui, id); diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c index 80943792ce5..7400e922b30 100644 --- a/source/blender/editors/interface/interface_utils.c +++ b/source/blender/editors/interface/interface_utils.c @@ -37,7 +37,6 @@ #include "BLT_translation.h" -#include "BKE_library.h" #include "BKE_report.h" #include "MEM_guardedalloc.h" @@ -265,29 +264,22 @@ void ui_rna_collection_search_cb(const struct bContext *C, void *arg, const char continue; } + name = RNA_struct_name_get_alloc(&itemptr, NULL, 0, NULL); /* could use the string length here */ iconid = 0; if (itemptr.type && RNA_struct_is_ID(itemptr.type)) { - name = MEM_malloc_arrayN(MAX_ID_FULL_NAME, sizeof(*name), __func__); - BKE_id_full_name_ui_prefix_get(name, itemptr.data); iconid = ui_id_icon_get(C, itemptr.data, false); } - else { - /* could use the string length here */ - name = RNA_struct_name_get_alloc(&itemptr, NULL, 0, NULL); - } if (name) { if (skip_filter || BLI_strcasestr(name, str)) { cis = MEM_callocN(sizeof(CollItemSearch), "CollectionItemSearch"); cis->data = itemptr.data; - cis->name = name; /* Still ownership of that memory. */ + cis->name = MEM_dupallocN(name); cis->index = i; cis->iconid = iconid; BLI_addtail(items_list, cis); } - else { - MEM_freeN(name); - } + MEM_freeN(name); } i++; |