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/include/UI_interface_icons.h | |
| 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/include/UI_interface_icons.h')
| -rw-r--r-- | source/blender/editors/include/UI_interface_icons.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h index 634dd3d5bbc..945ac1b6db9 100644 --- a/source/blender/editors/include/UI_interface_icons.h +++ b/source/blender/editors/include/UI_interface_icons.h @@ -34,9 +34,12 @@ struct bContext; struct ID; +struct Scene; struct PreviewImage; struct PointerRNA; +enum eIconSizes; + typedef struct IconFile { struct IconFile *next, *prev; char filename[256]; /* FILE_MAXFILE size */ @@ -60,6 +63,7 @@ int UI_icon_get_height(int icon_id); void UI_id_icon_render( const struct bContext *C, struct Scene *scene, struct ID *id, const bool big, const bool use_job); +int UI_preview_render_size(enum eIconSizes size); void UI_icon_draw(float x, float y, int icon_id); void UI_icon_draw_preview(float x, float y, int icon_id); @@ -78,5 +82,6 @@ int UI_iconfile_get_index(const char *filename); struct PreviewImage *UI_icon_to_preview(int icon_id); int UI_rnaptr_icon_get(struct bContext *C, struct PointerRNA *ptr, int rnaicon, const bool big); +int UI_idcode_icon_get(const int idcode); #endif /* __UI_INTERFACE_ICONS_H__ */ |