diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-12-28 14:28:44 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-12-28 14:28:44 +0300 |
| commit | f3fe2d0559070c31214063e1d6cf6b6207ff2f2f (patch) | |
| tree | 9910e6694e1a990118acd6deadc548c41965181c /source/blender/editors/interface/interface_icons.c | |
| parent | 7a7fb5add910ff247e703264c9a7557f7481805b (diff) | |
2.5
- New icons code crashed when using old (smaller) files, added a check
and warning print for this case.
Diffstat (limited to 'source/blender/editors/interface/interface_icons.c')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 4f66a263b04..4155935c28f 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -402,7 +402,7 @@ static void vicon_move_down_draw(int x, int y, int w, int h, float alpha) static void init_internal_icons() { bTheme *btheme= U.themes.first; - ImBuf *bbuf; + ImBuf *bbuf= NULL; int x, y; char iconfilestr[FILE_MAXDIR+FILE_MAXFILE]; char filenamestr[FILE_MAXFILE+16]; // 16 == strlen(".blender/icons/")+1 @@ -419,12 +419,15 @@ static void init_internal_icons() if (BLI_exists(iconfilestr)) { bbuf = IMB_loadiffname(iconfilestr, IB_rect); - } else { - bbuf = IMB_ibImageFromMemory((int *)datatoc_blenderbuttons, datatoc_blenderbuttons_size, IB_rect); + if(bbuf->x < ICON_IMAGE_W || bbuf->y < ICON_IMAGE_H) { + printf("\n***WARNING***\nIcons file %s too small.\nUsing built-in Icons instead\n", iconfilestr); + IMB_freeImBuf(bbuf); + bbuf= NULL; + } } - } else { - bbuf = IMB_ibImageFromMemory((int *)datatoc_blenderbuttons, datatoc_blenderbuttons_size, IB_rect); } + if(bbuf==NULL) + bbuf = IMB_ibImageFromMemory((int *)datatoc_blenderbuttons, datatoc_blenderbuttons_size, IB_rect); for (y=0; y<ICON_GRID_ROWS; y++) { for (x=0; x<ICON_GRID_COLS; x++) { |