[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31513] trunk/blender/source/blender/ editors/interface/interface_icons.c: Fix #23431: crash in brush icon preview when there is no active object.

[Brecht Van Lommel]

Revision: 31513
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31513
Author:   blendix
Date:     2010-08-22 12:17:31 +0200 (Sun, 22 Aug 2010)

Log Message:
-----------
Fix #23431: crash in brush icon preview when there is no active object.

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

Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c	2010-08-22 09:18:26 UTC (rev 31512)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c	2010-08-22 10:17:31 UTC (rev 31513)
@@ -1027,11 +1027,11 @@
 		EnumPropertyItem *items;
 		int tool;
 		
-		if(ob->mode & OB_MODE_SCULPT) {
+		if(ob && (ob->mode & OB_MODE_SCULPT)) {
 			items = brush_sculpt_tool_items;
 			tool = br->sculpt_tool;
 		}
-		else if(ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT)) {
+		else if(ob && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT))) {
 			items = brush_vertexpaint_tool_items;
 			tool = br->vertexpaint_tool;
 		}