diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-07-07 16:57:35 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-07-07 16:57:35 +0300 |
commit | 084d545202c27fda5117817491c8d5761b4daafc (patch) | |
tree | 8fa4b7a6cdec77ce07237b5e37370406bcedfda5 /source/blender/makesrna | |
parent | 28057d54de98687ed6ffdd47c2fcbb2e40f31d2e (diff) |
Cleanup: use BKE_packedfile prefix for function names
Avoid ambiguity with terms check & compare.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_image_api.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sound_api.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_vfont_api.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c index 933dae70457..0db099e3e1d 100644 --- a/source/blender/makesrna/intern/rna_image_api.c +++ b/source/blender/makesrna/intern/rna_image_api.c @@ -55,7 +55,7 @@ static void rna_ImagePackedFile_save(ImagePackedFile *imapf, Main *bmain, ReportList *reports) { - if (writePackedFile( + if (BKE_packedfile_write_to_file( reports, BKE_main_blendfile_path(bmain), imapf->filepath, imapf->packedfile, 0) != RET_OK) { BKE_reportf(reports, RPT_ERROR, "Could not save packed file to disk as '%s'", imapf->filepath); @@ -179,7 +179,7 @@ static void rna_Image_unpack(Image *image, Main *bmain, ReportList *reports, int } else { /* reports its own error on failure */ - unpackImage(bmain, reports, image, method); + BKE_packedfile_unpack_image(bmain, reports, image, method); } } diff --git a/source/blender/makesrna/intern/rna_sound_api.c b/source/blender/makesrna/intern/rna_sound_api.c index f172c659900..1482a08b893 100644 --- a/source/blender/makesrna/intern/rna_sound_api.c +++ b/source/blender/makesrna/intern/rna_sound_api.c @@ -34,7 +34,7 @@ static void rna_Sound_pack(bSound *sound, Main *bmain, ReportList *reports) { - sound->packedfile = newPackedFile(reports, sound->name, ID_BLEND_PATH(bmain, &sound->id)); + sound->packedfile = BKE_packedfile_new(reports, sound->name, ID_BLEND_PATH(bmain, &sound->id)); } static void rna_Sound_unpack(bSound *sound, Main *bmain, ReportList *reports, int method) @@ -44,7 +44,7 @@ static void rna_Sound_unpack(bSound *sound, Main *bmain, ReportList *reports, in } else { /* reports its own error on failure */ - unpackSound(bmain, reports, sound, method); + BKE_packedfile_unpack_sound(bmain, reports, sound, method); } } diff --git a/source/blender/makesrna/intern/rna_vfont_api.c b/source/blender/makesrna/intern/rna_vfont_api.c index f35a764b1b0..bdd73bbb3a6 100644 --- a/source/blender/makesrna/intern/rna_vfont_api.c +++ b/source/blender/makesrna/intern/rna_vfont_api.c @@ -34,7 +34,7 @@ static void rna_VectorFont_pack(VFont *vfont, Main *bmain, ReportList *reports) { - vfont->packedfile = newPackedFile(reports, vfont->name, ID_BLEND_PATH(bmain, &vfont->id)); + vfont->packedfile = BKE_packedfile_new(reports, vfont->name, ID_BLEND_PATH(bmain, &vfont->id)); } static void rna_VectorFont_unpack(VFont *vfont, Main *bmain, ReportList *reports, int method) @@ -44,7 +44,7 @@ static void rna_VectorFont_unpack(VFont *vfont, Main *bmain, ReportList *reports } else { /* reports its own error on failure */ - unpackVFont(bmain, reports, vfont, method); + BKE_packedfile_unpack_vfont(bmain, reports, vfont, method); } } |