[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28308] trunk/blender/source/blender: fix for crash getting the current material & more verbose library errors

[Campbell Barton]

Revision: 28308
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28308
Author:   campbellbarton
Date:     2010-04-20 18:12:39 +0200 (Tue, 20 Apr 2010)

Log Message:
-----------
fix for crash getting the current material & more verbose library errors

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/material.c
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c	2010-04-20 15:46:28 UTC (rev 28307)
+++ trunk/blender/source/blender/blenkernel/intern/material.c	2010-04-20 16:12:39 UTC (rev 28308)
@@ -451,7 +451,7 @@
 	if(act>ob->totcol) act= ob->totcol;
 	else if(act<=0) act= 1;
 
-	if(ob->matbits[act-1]) {	/* in object */
+	if(ob->matbits && ob->matbits[act-1]) {	/* in object */
 		ma= ob->mat[act-1];
 	}
 	else {								/* in data */

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2010-04-20 15:46:28 UTC (rev 28307)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-04-20 16:12:39 UTC (rev 28308)
@@ -12257,7 +12257,7 @@
 
 								append_id_part(fd, mainptr, id, &realid);
 								if (!realid) {
-									printf("LIB ERROR: can't find %s\n", id->name);
+									printf("LIB ERROR: %s:'%s' missing from '%s'\n", BLO_idcode_to_name(GS(id->name)), id->name+2, mainptr->curlib->filename);
 									BKE_reportf(fd->reports, RPT_ERROR, "LIB ERROR: %s:'%s' missing from '%s'\n", BLO_idcode_to_name(GS(id->name)), id->name+2, mainptr->curlib->filename);
 								}
 								
@@ -12293,9 +12293,8 @@
 				ID *idn= id->next;
 				if(id->flag & LIB_READ) {
 					BLI_remlink(lbarray[a], id);
-
-					printf("LIB ERROR: can't find %s\n", id->name);
-					BKE_reportf(basefd->reports, RPT_ERROR, "LIB ERROR: %s:'%s' missing from '%s'\n", BLO_idcode_to_name(GS(id->name)), id->name+2, mainptr->curlib->filename);
+					printf("LIB ERROR: %s:'%s' unread libblock missing from '%s'\n", BLO_idcode_to_name(GS(id->name)), id->name+2, mainptr->curlib->filename);
+					BKE_reportf(basefd->reports, RPT_ERROR, "LIB ERROR: %s:'%s' unread libblock missing from '%s'\n", BLO_idcode_to_name(GS(id->name)), id->name+2, mainptr->curlib->filename);
 					change_idid_adr(mainlist, basefd, id, NULL);
 
 					MEM_freeN(id);