Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto pack: don't show "No new files have been packed" on every .blend file save.

Browse Source
This commit is contained in:
Brecht Van Lommel
2015-05-01 16:03:45 +02:00
parent 4e40bdd02c
commit bf7098a93f
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_packedFile.h
View File

@@ -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 *newPackedFile(struct ReportList *reports, const char *filename, const char *relabase);
struct PackedFile *newPackedFileMemory(void *mem, int memlen); 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); void packLibraries(struct Main *bmain, struct ReportList *reports);
/* unpack */ /* unpack */

10
source/blender/blenkernel/intern/packedFile.c
View File

@@ -224,7 +224,7 @@ PackedFile *newPackedFile(ReportList *reports, const char *filename, const char
} }
/* no libraries for now */ /* no libraries for now */
void packAll(Main *bmain, ReportList *reports) void packAll(Main *bmain, ReportList *reports, bool verbose)
{ {
Image *ima; Image *ima;
VFont *vfont; VFont *vfont;
@@ -237,7 +237,7 @@ void packAll(Main *bmain, ReportList *reports)
BKE_image_packfiles(reports, ima, ID_BLEND_PATH(bmain, &ima->id)); BKE_image_packfiles(reports, ima, ID_BLEND_PATH(bmain, &ima->id));
tot ++; 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", BKE_reportf(reports, RPT_WARNING, "Image '%s' skipped, movies and image sequences not supported",
ima->id.name + 2); ima->id.name + 2);
} }
@@ -258,10 +258,10 @@ void packAll(Main *bmain, ReportList *reports)
} }
} }
if (tot == 0) if (tot > 0)
BKE_report(reports, RPT_INFO, "No new files have been packed");
else
BKE_reportf(reports, RPT_INFO, "Packed %d files", tot); BKE_reportf(reports, RPT_INFO, "Packed %d files", tot);
else if (verbose)
BKE_report(reports, RPT_INFO, "No new files have been packed");
} }

4
source/blender/editors/space_info/info_ops.c
View File

@@ -134,7 +134,7 @@ static int autopack_toggle_exec(bContext *C, wmOperator *op)
G.fileflags &= ~G_AUTOPACK; G.fileflags &= ~G_AUTOPACK;
} }
else { else {
packAll(bmain, op->reports); packAll(bmain, op->reports, true);
G.fileflags |= G_AUTOPACK; G.fileflags |= G_AUTOPACK;
} }
@@ -161,7 +161,7 @@ static int pack_all_exec(bContext *C, wmOperator *op)
{ {
Main *bmain = CTX_data_main(C); Main *bmain = CTX_data_main(C);
packAll(bmain, op->reports); packAll(bmain, op->reports, true);
G.fileflags |= G_AUTOPACK; G.fileflags |= G_AUTOPACK;
return OPERATOR_FINISHED; return OPERATOR_FINISHED;

2
source/blender/windowmanager/intern/wm_files.c
View File

@@ -951,7 +951,7 @@ int wm_file_write(bContext *C, const char *filepath, int fileflags, ReportList *
/* operator now handles overwrite checks */ /* operator now handles overwrite checks */
if (G.fileflags & G_AUTOPACK) { if (G.fileflags & G_AUTOPACK) {
packAll(G.main, reports); packAll(G.main, reports, false);
} }
/* don't forget not to return without! */ /* don't forget not to return without! */