Revision: 28164
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28164
Author:   campbellbarton
Date:     2010-04-13 16:46:19 +0200 (Tue, 13 Apr 2010)

Log Message:
-----------
fix for rare case when icon textures wont load.

Modified Paths:
--------------
    branches/render25/source/blender/editors/interface/interface_icons.c

Modified: branches/render25/source/blender/editors/interface/interface_icons.c
===================================================================
--- branches/render25/source/blender/editors/interface/interface_icons.c        
2010-04-13 14:02:58 UTC (rev 28163)
+++ branches/render25/source/blender/editors/interface/interface_icons.c        
2010-04-13 14:46:19 UTC (rev 28164)
@@ -518,12 +518,14 @@
        else
                icontype= ICON_TYPE_BUFFER;
        
-       for (y=0; y<ICON_GRID_ROWS; y++) {
-               for (x=0; x<ICON_GRID_COLS; x++) {
-                       def_internal_icon(bbuf, BIFICONID_FIRST + 
y*ICON_GRID_COLS + x,
-                               
x*(ICON_GRID_W+ICON_GRID_MARGIN)+ICON_GRID_MARGIN,
-                               
y*(ICON_GRID_H+ICON_GRID_MARGIN)+ICON_GRID_MARGIN, ICON_GRID_W,
-                               icontype);
+       if(bbuf) {
+               for (y=0; y<ICON_GRID_ROWS; y++) {
+                       for (x=0; x<ICON_GRID_COLS; x++) {
+                               def_internal_icon(bbuf, BIFICONID_FIRST + 
y*ICON_GRID_COLS + x,
+                                       
x*(ICON_GRID_W+ICON_GRID_MARGIN)+ICON_GRID_MARGIN,
+                                       
y*(ICON_GRID_H+ICON_GRID_MARGIN)+ICON_GRID_MARGIN, ICON_GRID_W,
+                                       icontype);
+                       }
                }
        }
 


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to