diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
commit | 0775680e4d05eda3c495a56dc0b6eafbe96dc586 (patch) | |
tree | 4f3286eef96dec6ababe43467ed2a4f50388b988 /source/blender/editors/interface/interface_icons.c | |
parent | 4ade467fc6adfc13ce9e21d7e50b366fce70ea5f (diff) | |
parent | 6bc007610263c879f6bb30b844ba9d9a0fb9433c (diff) |
Merge branch 'master' into UI-graphical-redesignUI-graphical-redesign
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/resources.c
Diffstat (limited to 'source/blender/editors/interface/interface_icons.c')
-rw-r--r-- | source/blender/editors/interface/interface_icons.c | 70 |
1 files changed, 67 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index db1eacf57dc..796a7646b87 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -757,7 +757,7 @@ static void init_iconfile_list(struct ListBase *list) } } - BLI_filelist_free(dir, totfile, NULL); + BLI_filelist_free(dir, totfile); dir = NULL; } @@ -900,7 +900,7 @@ void UI_icons_init(int first_dyn_id) /* Render size for preview images and icons */ -static int preview_render_size(enum eIconSizes size) +int UI_preview_render_size(enum eIconSizes size) { switch (size) { case ICON_SIZE_ICON: @@ -916,7 +916,7 @@ static int preview_render_size(enum eIconSizes size) */ static void icon_create_rect(struct PreviewImage *prv_img, enum eIconSizes size) { - unsigned int render_size = preview_render_size(size); + unsigned int render_size = UI_preview_render_size(size); if (!prv_img) { if (G.debug & G_DEBUG) @@ -1399,6 +1399,70 @@ int UI_rnaptr_icon_get(bContext *C, PointerRNA *ptr, int rnaicon, const bool big return rnaicon; } +int UI_idcode_icon_get(const int idcode) +{ + switch (idcode) { + case ID_AC: + return ICON_ANIM_DATA; + case ID_AR: + return ICON_ARMATURE_DATA; + case ID_BR: + return ICON_BRUSH_DATA; + case ID_CA: + return ICON_CAMERA_DATA; + case ID_CU: + return ICON_CURVE_DATA; + case ID_GD: + return ICON_GREASEPENCIL; + case ID_GR: + return ICON_GROUP; + case ID_IM: + return ICON_IMAGE_DATA; + case ID_LA: + return ICON_LAMP_DATA; + case ID_LS: + return ICON_LINE_DATA; + case ID_LT: + return ICON_LATTICE_DATA; + case ID_MA: + return ICON_MATERIAL_DATA; + case ID_MB: + return ICON_META_DATA; + case ID_MC: + return ICON_CLIP; + case ID_ME: + return ICON_MESH_DATA; + case ID_MSK: + return ICON_MOD_MASK; /* TODO! this would need its own icon! */ + case ID_NT: + return ICON_NODETREE; + case ID_OB: + return ICON_OBJECT_DATA; + case ID_PA: + return ICON_PARTICLE_DATA; + case ID_PAL: + return ICON_COLOR; /* TODO! this would need its own icon! */ + case ID_PC: + return ICON_CURVE_BEZCURVE; /* TODO! this would need its own icon! */ + case ID_SCE: + return ICON_SCENE_DATA; + case ID_SPK: + return ICON_SPEAKER; + case ID_SO: + return ICON_SOUND; + case ID_TE: + return ICON_TEXTURE_DATA; + case ID_TXT: + return ICON_TEXT; + case ID_VF: + return ICON_FONT_DATA; + case ID_WO: + return ICON_WORLD_DATA; + default: + return ICON_NONE; + } +} + static void icon_draw_at_size( float x, float y, int icon_id, float aspect, float alpha, enum eIconSizes size, const bool nocreate) |