diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-12-28 09:17:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-12-28 09:21:29 +0300 |
| commit | 641d4e2b7fc4fd563c3c2dd880c8c412dd35ce9a (patch) | |
| tree | 6ec890d6f2aa558e1ada6cf6df94d121b9759134 /source/blender/editors | |
| parent | 12874c703cb4fe28600e2533309b3f855b226635 (diff) | |
Cleanup: use BLI_libblock prefix for id functions
- test_idbutton -> BLI_libblock_ensure_unique_name (not only used from UI)
- BKE_rename_id -> BKE_libblock_rename (always pass valid main)
also rename:
- name_uiprefix_id -> BKE_id_uiprefix
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 4d0c4ad863c..0b53232c29b 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1524,7 +1524,7 @@ static void rna_search_cb(const struct bContext *C, void *arg_but, const char *s #if 0 /* this name is used for a string comparison and can't be modified, TODO */ /* if ever enabled, make name_ui be MAX_ID_NAME+1 */ - name_uiprefix_id(name_ui, id); + BKE_id_ui_prefix(name_ui, id); #else BLI_strncpy(name_ui, id->name + 2, sizeof(name_ui)); #endif diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index b53fa270898..bda84fe6c03 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -148,11 +148,11 @@ static void id_search_cb(const bContext *C, void *arg_template, const char *str, continue; if (*str == '\0' || BLI_strcasestr(id->name + 2, str)) { - /* +1 is needed because name_uiprefix_id used 3 letter prefix + /* +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_NAME + 1]; - name_uiprefix_id(name_ui, id); + BKE_id_ui_prefix(name_ui, id); iconid = ui_id_icon_get(C, id, template->preview); diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 09c9f88c55f..cc86aa8877e 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -474,7 +474,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname) TreeElement *te = outliner_find_tree_element(&soops->tree, tselem); if (tselem->type == 0) { - test_idbutton(tselem->id->name); // library.c, unique name and alpha sort + BLI_libblock_ensure_unique_name(G.main, tselem->id->name); switch (GS(tselem->id->name)) { case ID_MA: @@ -509,7 +509,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname) defgroup_unique_name(te->directdata, (Object *)tselem->id); // id = object break; case TSE_NLA_ACTION: - test_idbutton(tselem->id->name); + BLI_libblock_ensure_unique_name(G.main, tselem->id->name); break; case TSE_EBONE: { |