[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28823] trunk/blender/source/blender/ blenkernel/intern/packedFile.c: make pack all not back library data, dont attempt to pack image viewers or generated images.

[Campbell Barton]

Revision: 28823
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28823
Author:   campbellbarton
Date:     2010-05-18 15:18:37 +0200 (Tue, 18 May 2010)

Log Message:
-----------
make pack all not back library data, dont attempt to pack image viewers or generated images.

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

Modified: trunk/blender/source/blender/blenkernel/intern/packedFile.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/packedFile.c	2010-05-18 12:51:56 UTC (rev 28822)
+++ trunk/blender/source/blender/blenkernel/intern/packedFile.c	2010-05-18 13:18:37 UTC (rev 28823)
@@ -186,7 +186,7 @@
 
 	file= open(name, O_BINARY|O_RDONLY);
 	if (file <= 0) {
-		BKE_reportf(reports, RPT_ERROR, "Can't open file: \"%s\"", name);
+		BKE_reportf(reports, RPT_ERROR, "Unable to pack file, source path not found: \"%s\"", name);
 	} else {
 		filelen = BLI_filesize(file);
 
@@ -216,15 +216,15 @@
 	bSound *sound;
 
 	for(ima=bmain->image.first; ima; ima=ima->id.next)
-		if(ima->packedfile == NULL)
+		if(ima->packedfile == NULL && ima->id.lib==NULL && ELEM3(ima->type, IMA_SRC_FILE, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE))
 			ima->packedfile = newPackedFile(reports, ima->name);
 
 	for(vf=bmain->vfont.first; vf; vf=vf->id.next)
-		if(vf->packedfile == NULL)
+		if(vf->packedfile == NULL && vf->id.lib==NULL)
 			vf->packedfile = newPackedFile(reports, vf->name);
 
 	for(sound=bmain->sound.first; sound; sound=sound->id.next)
-		if(sound->packedfile == NULL)
+		if(sound->packedfile == NULL && vf->id.lib==NULL)
 			sound->packedfile = newPackedFile(reports, sound->name);
 }