[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26809] trunk/blender/source/blender/ blenkernel/intern/icons.c: fix for crash when running in background mode and adjusting materials

[Campbell Barton]

Revision: 26809
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26809
Author:   campbellbarton
Date:     2010-02-11 17:54:25 +0100 (Thu, 11 Feb 2010)

Log Message:
-----------
fix for crash when running in background mode and adjusting materials

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/icons.c

Modified: trunk/blender/source/blender/blenkernel/intern/icons.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/icons.c	2010-02-11 16:28:31 UTC (rev 26808)
+++ trunk/blender/source/blender/blenkernel/intern/icons.c	2010-02-11 16:54:25 UTC (rev 26809)
@@ -49,6 +49,7 @@
 
 #include "BKE_icons.h"
 #include "BKE_utildefines.h"
+#include "BKE_global.h" /* only for G.background test */
 
 #include "BLO_sys_types.h" // for intptr_t support
 
@@ -217,7 +218,7 @@
 {
 	Icon* icon = 0;
 	
-	if (!id) return;
+	if (!id || G.background) return;
 
 	icon = BLI_ghash_lookup(gIcons, SET_INT_IN_POINTER(id));
 	
@@ -239,7 +240,7 @@
 {
 	Icon* new_icon = 0;
 
-	if (!id)
+	if (!id || G.background)
 		return 0;
 
 	if (id->icon_id)