From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- .../blender/editors/include/UI_interface_icons.h | 34 +++++++++++++++------- 1 file changed, 23 insertions(+), 11 deletions(-) (limited to 'source/blender/editors/include/UI_interface_icons.h') diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h index bd1f04ebcff..5666421c27f 100644 --- a/source/blender/editors/include/UI_interface_icons.h +++ b/source/blender/editors/include/UI_interface_icons.h @@ -33,18 +33,18 @@ struct bContext; enum eIconSizes; typedef struct IconFile { - struct IconFile *next, *prev; - char filename[256]; /* FILE_MAXFILE size */ - int index; + struct IconFile *next, *prev; + char filename[256]; /* FILE_MAXFILE size */ + int index; } IconFile; #define ICON_DEFAULT_HEIGHT 16 -#define ICON_DEFAULT_WIDTH 16 +#define ICON_DEFAULT_WIDTH 16 #define ICON_DEFAULT_HEIGHT_TOOLBAR 32 #define ICON_DEFAULT_HEIGHT_SCALE ((int)(UI_UNIT_Y * 0.8f)) -#define ICON_DEFAULT_WIDTH_SCALE ((int)(UI_UNIT_X * 0.8f)) +#define ICON_DEFAULT_WIDTH_SCALE ((int)(UI_UNIT_X * 0.8f)) #define PREVIEW_DEFAULT_HEIGHT 128 @@ -55,20 +55,32 @@ void UI_icons_init(void); int UI_icon_get_width(int icon_id); 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); +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_alpha(float x, float y, int icon_id, float alpha); void UI_icon_draw_preview(float x, float y, int icon_id); void UI_icon_draw_preview_aspect(float x, float y, int icon_id, float aspect); -void UI_icon_draw_preview_aspect_size(float x, float y, int icon_id, float aspect, float alpha, int size); +void UI_icon_draw_preview_aspect_size( + float x, float y, int icon_id, float aspect, float alpha, int size); -void UI_icon_draw_aspect(float x, float y, int icon_id, float aspect, float alpha, const char mono_color[4]); -void UI_icon_draw_aspect_color(float x, float y, int icon_id, float aspect, const float rgb[3], const char mono_color[4]); +void UI_icon_draw_aspect( + float x, float y, int icon_id, float aspect, float alpha, const char mono_color[4]); +void UI_icon_draw_aspect_color( + float x, float y, int icon_id, float aspect, const float rgb[3], const char mono_color[4]); void UI_icon_draw_size(float x, float y, int size, int icon_id, float alpha); -void UI_icon_draw_desaturate(float x, float y, int icon_id, float aspect, float alpha, float desaturate, const char mono_color[4]); +void UI_icon_draw_desaturate(float x, + float y, + int icon_id, + float aspect, + float alpha, + float desaturate, + const char mono_color[4]); void UI_icons_free(void); void UI_icons_free_drawinfo(void *drawinfo); -- cgit v1.2.3