From bf7098a93f5a8b45e94795a99c8fb8942b3ac1c6 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Fri, 1 May 2015 16:03:45 +0200
Subject: Auto pack: don't show "No new files have been packed" on every .blend
 file save.

---
 source/blender/blenkernel/BKE_packedFile.h     |  2 +-
 source/blender/blenkernel/intern/packedFile.c  | 10 +++++-----
 source/blender/editors/space_info/info_ops.c   |  4 ++--
 source/blender/windowmanager/intern/wm_files.c |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/blenkernel/BKE_packedFile.h b/source/blender/blenkernel/BKE_packedFile.h
index 8fab44121de..a2397922061 100644
--- a/source/blender/blenkernel/BKE_packedFile.h
+++ b/source/blender/blenkernel/BKE_packedFile.h
@@ -48,7 +48,7 @@ struct PackedFile *dupPackedFile(const struct PackedFile *pf_src);
 struct PackedFile *newPackedFile(struct ReportList *reports, const char *filename, const char *relabase);
 struct PackedFile *newPackedFileMemory(void *mem, int memlen);
 
-void packAll(struct Main *bmain, struct ReportList *reports);
+void packAll(struct Main *bmain, struct ReportList *reports, bool verbose);
 void packLibraries(struct Main *bmain, struct ReportList *reports);
 
 /* unpack */
diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c
index 61e39d0ad47..68212521617 100644
--- a/source/blender/blenkernel/intern/packedFile.c
+++ b/source/blender/blenkernel/intern/packedFile.c
@@ -224,7 +224,7 @@ PackedFile *newPackedFile(ReportList *reports, const char *filename, const char
 }
 
 /* no libraries for now */
-void packAll(Main *bmain, ReportList *reports)
+void packAll(Main *bmain, ReportList *reports, bool verbose)
 {
 	Image *ima;
 	VFont *vfont;
@@ -237,7 +237,7 @@ void packAll(Main *bmain, ReportList *reports)
 				BKE_image_packfiles(reports, ima, ID_BLEND_PATH(bmain, &ima->id));
 				tot ++;
 			}
-			else if (BKE_image_is_animated(ima)) {
+			else if (BKE_image_is_animated(ima) && verbose) {
 				BKE_reportf(reports, RPT_WARNING, "Image '%s' skipped, movies and image sequences not supported",
 				            ima->id.name + 2);
 			}
@@ -258,10 +258,10 @@ void packAll(Main *bmain, ReportList *reports)
 		}
 	}
 	
-	if (tot == 0)
-		BKE_report(reports, RPT_INFO, "No new files have been packed");
-	else
+	if (tot > 0)
 		BKE_reportf(reports, RPT_INFO, "Packed %d files", tot);
+	else if (verbose)
+		BKE_report(reports, RPT_INFO, "No new files have been packed");
 
 
 }
diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c
index 240d8baa6f2..a1f90f16bbf 100644
--- a/source/blender/editors/space_info/info_ops.c
+++ b/source/blender/editors/space_info/info_ops.c
@@ -134,7 +134,7 @@ static int autopack_toggle_exec(bContext *C, wmOperator *op)
 		G.fileflags &= ~G_AUTOPACK;		
 	}
 	else {
-		packAll(bmain, op->reports);
+		packAll(bmain, op->reports, true);
 		G.fileflags |= G_AUTOPACK;
 	}
 	
@@ -161,7 +161,7 @@ static int pack_all_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	
-	packAll(bmain, op->reports);
+	packAll(bmain, op->reports, true);
 	G.fileflags |= G_AUTOPACK;
 	
 	return OPERATOR_FINISHED;
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index df0d27bc43e..a3cbb2b6eec 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -951,7 +951,7 @@ int wm_file_write(bContext *C, const char *filepath, int fileflags, ReportList *
 	/* operator now handles overwrite checks */
 
 	if (G.fileflags & G_AUTOPACK) {
-		packAll(G.main, reports);
+		packAll(G.main, reports, false);
 	}
 
 	/* don't forget not to return without! */
-- 
cgit v1.2.3