Revision: 29646
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29646
Author: campbellbarton
Date: 2010-06-23 13:46:58 +0200 (Wed, 23 Jun 2010)
Log Message:
-----------
fix for rare crash when a material is set in the outliner for an object with no
material bits.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_outliner/outliner.c
Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c
2010-06-23 10:48:09 UTC (rev 29645)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c
2010-06-23 11:46:58 UTC (rev 29646)
@@ -1927,7 +1927,8 @@
/* we search for the object parent */
ob= (Object *)outliner_search_back(soops, te, ID_OB);
- if(ob==NULL || ob!=OBACT) return 0; // just paranoia
+ // note: ob->matbits can be NULL when a local object points to a
library mesh.
+ if(ob==NULL || ob!=OBACT || ob->matbits==NULL) return 0; // just
paranoia
/* searching in ob mat array? */
tes= te->parent;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
