Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-09-18 03:24:14 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-09-18 03:24:14 +0300
commit1dda60792cc303ec81785d6a79926eed9a4da3d3 (patch)
treedde8200f426561b524a3e8526d6570aff879b1bb /source/blender/editors/object
parentcacd57b67a15e08bce3b1c9a136004516c593672 (diff)
Cleanup: use 'UI_icon_*' prefix for icons API
- UI_collection_color_icon_get -> UI_icon_color_from_collection - UI_idcode_icon_get -> UI_icon_from_idcode - UI_library_icon_get -> UI_icon_from_library - UI_mode_icon_get -> UI_icon_from_object_mode - UI_rnaptr_icon_get -> UI_icon_from_rnaptr - UI_alert_image -> UI_icon_alert_imbuf_get - UI_preview_render_size -> UI_icon_preview_to_render_size - UI_id_icon_render -> UI_icon_render_id
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_collection.c2
-rw-r--r--source/blender/editors/object/object_edit.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_collection.c b/source/blender/editors/object/object_collection.c
index 5f14cdcd299..ea203468e74 100644
--- a/source/blender/editors/object/object_collection.c
+++ b/source/blender/editors/object/object_collection.c
@@ -96,7 +96,7 @@ static const EnumPropertyItem *collection_object_active_itemf(bContext *C,
collection = NULL;
while ((collection = BKE_collection_object_find(bmain, scene, collection, ob))) {
item_tmp.identifier = item_tmp.name = collection->id.name + 2;
- item_tmp.icon = UI_collection_color_icon_get(collection);
+ item_tmp.icon = UI_icon_color_from_collection(collection);
item_tmp.value = i;
RNA_enum_item_add(&item, &totitem, &item_tmp);
i++;
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 7a17cdc30e4..9c05dbb7b1c 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1853,7 +1853,7 @@ static void move_to_collection_menu_create(bContext *C, uiLayout *layout, void *
Scene *scene = CTX_data_scene(C);
const int icon = (menu->collection == scene->master_collection) ?
ICON_SCENE_DATA :
- UI_collection_color_icon_get(menu->collection);
+ UI_icon_color_from_collection(menu->collection);
uiItemIntO(layout, name, icon, menu->ot->idname, "collection_index", menu->index);
for (MoveToCollectionData *submenu = menu->submenus.first; submenu != NULL;
@@ -1864,7 +1864,7 @@ static void move_to_collection_menu_create(bContext *C, uiLayout *layout, void *
static void move_to_collection_menus_items(uiLayout *layout, MoveToCollectionData *menu)
{
- const int icon = UI_collection_color_icon_get(menu->collection);
+ const int icon = UI_icon_color_from_collection(menu->collection);
if (BLI_listbase_is_empty(&menu->submenus)) {
uiItemIntO(layout,