diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 12:07:14 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 12:07:14 +0300 |
commit | 24d1829243c6e41c639c1d0722a13599a7c1927c (patch) | |
tree | 1969bb05e65d1304994088aa3839df593dd050b3 /source/blender/blenkernel/BKE_packedFile.h | |
parent | 84a9647f223d46ba6c159f00b3df1cbb41fde9d2 (diff) |
Cleanup: nuke G.main out of BKE PackedFile code.
Diffstat (limited to 'source/blender/blenkernel/BKE_packedFile.h')
-rw-r--r-- | source/blender/blenkernel/BKE_packedFile.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_packedFile.h b/source/blender/blenkernel/BKE_packedFile.h index a2397922061..ed6d66906d1 100644 --- a/source/blender/blenkernel/BKE_packedFile.h +++ b/source/blender/blenkernel/BKE_packedFile.h @@ -52,21 +52,25 @@ void packAll(struct Main *bmain, struct ReportList *reports, bool verbose); void packLibraries(struct Main *bmain, struct ReportList *reports); /* unpack */ -char *unpackFile(struct ReportList *reports, const char *abs_name, const char *local_name, struct PackedFile *pf, int how); -int unpackVFont(struct ReportList *reports, struct VFont *vfont, int how); +char *unpackFile( + struct ReportList *reports, const char *ref_file_name, + const char *abs_name, const char *local_name, struct PackedFile *pf, int how); +int unpackVFont(struct Main *bmain, struct ReportList *reports, struct VFont *vfont, int how); int unpackSound(struct Main *bmain, struct ReportList *reports, struct bSound *sound, int how); -int unpackImage(struct ReportList *reports, struct Image *ima, int how); +int unpackImage(struct Main *bmain, struct ReportList *reports, struct Image *ima, int how); void unpackAll(struct Main *bmain, struct ReportList *reports, int how); int unpackLibraries(struct Main *bmain, struct ReportList *reports); -int writePackedFile(struct ReportList *reports, const char *filename, struct PackedFile *pf, int guimode); +int writePackedFile( + struct ReportList *reports, const char *ref_file_name, + const char *filename, struct PackedFile *pf, const bool guimode); /* free */ void freePackedFile(struct PackedFile *pf); /* info */ int countPackedFiles(struct Main *bmain); -int checkPackedFile(const char *filename, struct PackedFile *pf); +int checkPackedFile(const char *ref_file_name, const char *filename, struct PackedFile *pf); /* read */ int seekPackedFile(struct PackedFile *pf, int offset, int whence); |