[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32398] trunk/blender/source/blender/ blenkernel/intern/packedFile.c: [#24204] Packing of image sequence does not work

Campbell Barton ideasman42 at gmail.com
Sun Oct 10 23:39:25 CEST 2010


Revision: 32398
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32398
Author:   campbellbarton
Date:     2010-10-10 23:39:24 +0200 (Sun, 10 Oct 2010)

Log Message:
-----------
[#24204] Packing of image sequence does not work
this isnt supported but at least display a warning.

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-10-10 20:59:30 UTC (rev 32397)
+++ trunk/blender/source/blender/blenkernel/intern/packedFile.c	2010-10-10 21:39:24 UTC (rev 32398)
@@ -214,11 +214,18 @@
 	Image *ima;
 	VFont *vf;
 	bSound *sound;
+	
+	for(ima=bmain->image.first; ima; ima=ima->id.next) {
+		if(ima->packedfile == NULL && ima->id.lib==NULL) { 
+			if(ima->source==IMA_SRC_FILE) {
+				ima->packedfile = newPackedFile(reports, ima->name);
+			}
+			else if(ELEM(ima->source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) {
+				BKE_reportf(reports, RPT_WARNING, "Image '%s' skipped, movies and image sequences not supported.", ima->id.name+2);
+			}
+		}
+	}
 
-	for(ima=bmain->image.first; ima; ima=ima->id.next)
-		if(ima->packedfile == NULL && ima->id.lib==NULL && ELEM3(ima->source, 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 && vf->id.lib==NULL && strcmp(vf->name, "<builtin>") != 0)
 			vf->packedfile = newPackedFile(reports, vf->name);





More information about the Bf-blender-cvs mailing list