archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

minor changes, dont append with cmake platform flags which is a string and use enum values rather then ints in a few places.

Browse Source
This commit is contained in:
Campbell Barton
2011-09-30 15:22:13 +00:00
parent ca2528d551
commit f3ae228c9d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/interface/interface.c
View File

@@ -2467,7 +2467,7 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, const char *str,
but->pointype= type & BUTPOIN;
but->bit= type & BIT;
but->bitnr= type & 31;
but->icon = 0;
but->icon = ICON_NONE;
but->iconadd=0;
but->retval= retval;

6
source/blender/editors/interface/interface_icons.c
View File

@@ -1018,9 +1018,9 @@ static void ui_id_icon_render(bContext *C, ID *id, int big)
{
/* create the rect if necessary */
icon_set_image(C, id, pi, 0); /* icon size */
icon_set_image(C, id, pi, ICON_SIZE_ICON); /* icon size */
if (big)
icon_set_image(C, id, pi, 1); /* bigger preview size */
icon_set_image(C, id, pi, ICON_SIZE_PREVIEW); /* bigger preview size */
pi->changed[0] = 0;
}
@@ -1030,7 +1030,7 @@ static void ui_id_icon_render(bContext *C, ID *id, int big)
static void ui_id_brush_render(bContext *C, ID *id)
{
PreviewImage *pi = BKE_previewimg_get(id);
int i;
enum eIconSizes i;
if(!pi)
return;

2
source/blender/makesdna/DNA_ID.h
View File

@@ -125,7 +125,7 @@ typedef struct Library {
enum eIconSizes {
ICON_SIZE_ICON,
ICON_SIZE_PREVIEW,
ICON_SIZE_PREVIEW
};
#define NUM_ICON_SIZES (ICON_SIZE_PREVIEW + 1)