[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50954] trunk/blender/source/blender/ blenloader/intern/readfile.c: demote library linking errors from ERROR' s to warnings, since errors will throw a python exception and stop the script when loading a blend file by calling a python operator .
Campbell Barton
ideasman42 at gmail.com
Sun Sep 30 12:38:13 CEST 2012
Revision: 50954
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50954
Author: campbellbarton
Date: 2012-09-30 10:38:12 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
demote library linking errors from ERROR's to warnings, since errors will throw a python exception and stop the script when loading a blend file by calling a python operator.
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-09-30 06:12:47 UTC (rev 50953)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-09-30 10:38:12 UTC (rev 50954)
@@ -4781,7 +4781,7 @@
base->object = newlibadr_us(fd, sce->id.lib, base->object);
if (base->object == NULL) {
- BKE_reportf_wrap(fd->reports, RPT_ERROR,
+ BKE_reportf_wrap(fd->reports, RPT_WARNING,
"LIB ERROR: Object lost from scene:'%s\'",
sce->id.name + 2);
BLI_remlink(&sce->base, base);
@@ -9594,7 +9594,7 @@
else mainptr->curlib->filedata = NULL;
if (fd == NULL) {
- BKE_reportf_wrap(basefd->reports, RPT_ERROR,
+ BKE_reportf_wrap(basefd->reports, RPT_WARNING,
"Can't find lib '%s'",
mainptr->curlib->filepath);
}
@@ -9613,7 +9613,7 @@
append_id_part(fd, mainptr, id, &realid);
if (!realid) {
- BKE_reportf_wrap(fd->reports, RPT_ERROR,
+ BKE_reportf_wrap(fd->reports, RPT_WARNING,
"LIB ERROR: %s:'%s' missing from '%s'",
BKE_idcode_to_name(GS(id->name)),
id->name+2, mainptr->curlib->filepath);
@@ -9645,7 +9645,7 @@
idn = id->next;
if (id->flag & LIB_READ) {
BLI_remlink(lbarray[a], id);
- BKE_reportf_wrap(basefd->reports, RPT_ERROR,
+ BKE_reportf_wrap(basefd->reports, RPT_WARNING,
"LIB ERROR: %s:'%s' unread libblock missing from '%s'",
BKE_idcode_to_name(GS(id->name)), id->name + 2, mainptr->curlib->filepath);
change_idid_adr(mainlist, basefd, id, NULL);
More information about the Bf-blender-cvs
mailing list