[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18119] branches/blender2.5/blender/source /blender/editors: 2.5

[Ton Roosendaal]

Revision: 18119
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18119
Author:   ton
Date:     2008-12-28 12:28:44 +0100 (Sun, 28 Dec 2008)

Log Message:
-----------
2.5

- New icons code crashed when using old (smaller) files, added a check
  and warning print for this case.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_icons.c
    branches/blender2.5/blender/source/blender/editors/space_node/Makefile

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_icons.c	2008-12-28 11:27:54 UTC (rev 18118)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_icons.c	2008-12-28 11:28:44 UTC (rev 18119)
@@ -402,7 +402,7 @@
 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 @@
 		
 		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 {
+	}
+	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++) {

Modified: branches/blender2.5/blender/source/blender/editors/space_node/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/Makefile	2008-12-28 11:27:54 UTC (rev 18118)
+++ branches/blender2.5/blender/source/blender/editors/space_node/Makefile	2008-12-28 11:28:44 UTC (rev 18119)
@@ -45,6 +45,7 @@
 CPPFLAGS += -I../../blenkernel
 CPPFLAGS += -I../../blenlib
 CPPFLAGS += -I../../makesdna
+CPPFLAGS += -I../../makesrna
 CPPFLAGS += -I../../imbuf
 CPPFLAGS += -I../../nodes
 CPPFLAGS += -I../../render/extern/include