diff options
author | Campbell Barton <campbell@blender.org> | 2022-03-24 08:33:32 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-03-24 08:54:01 +0300 |
commit | 4682a0882f02c50b20aa3c4bf9abe9f7ec2e834b (patch) | |
tree | 36dc6fb09eaa1d539e516875ed957aba5334666e /source/blender/blenkernel | |
parent | 5058c4b1446f58bb9a5ddcb65f7353d9df3a594a (diff) |
Cleanup: use "filepath" instead of "filename" for full paths
Reserve "filename" when only the name component is used.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_dynamicpaint.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_image_save.h | 13 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_packedFile.h | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image_save.cc | 18 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/packedFile.c | 16 |
6 files changed, 32 insertions, 27 deletions
diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h index 5a1c99774fd..109d3e6d977 100644 --- a/source/blender/blenkernel/BKE_dynamicpaint.h +++ b/source/blender/blenkernel/BKE_dynamicpaint.h @@ -129,7 +129,7 @@ int dynamicPaint_calculateFrame(struct DynamicPaintSurface *surface, struct Object *cObject, int frame); void dynamicPaint_outputSurfaceImage(struct DynamicPaintSurface *surface, - char *filename, + const char *filepath, short output_layer); /* PaintPoint state */ diff --git a/source/blender/blenkernel/BKE_image_save.h b/source/blender/blenkernel/BKE_image_save.h index b022e677845..052fc937af9 100644 --- a/source/blender/blenkernel/BKE_image_save.h +++ b/source/blender/blenkernel/BKE_image_save.h @@ -49,21 +49,26 @@ bool BKE_image_save(struct ReportList *reports, /* Render saving. */ -/* Save single or multilayer OpenEXR files from the render result. - * Optionally saves only a specific view or layer. */ +/** + * Save single or multi-layer OpenEXR files from the render result. + * Optionally saves only a specific view or layer. + */ bool BKE_image_render_write_exr(struct ReportList *reports, const struct RenderResult *rr, - const char *filename, + const char *filepath, const struct ImageFormatData *imf, const bool save_as_render, const char *view, int layer); +/** + * \param filepath_basis: May be used as-is, or used as a basis for multi-view images. + */ bool BKE_image_render_write(struct ReportList *reports, struct RenderResult *rr, const struct Scene *scene, const bool stamp, - const char *name); + const char *filepath_basis); #ifdef __cplusplus } diff --git a/source/blender/blenkernel/BKE_packedFile.h b/source/blender/blenkernel/BKE_packedFile.h index 8433894b8c5..893aa2a5b1c 100644 --- a/source/blender/blenkernel/BKE_packedFile.h +++ b/source/blender/blenkernel/BKE_packedFile.h @@ -45,7 +45,7 @@ enum ePF_FileStatus { struct PackedFile *BKE_packedfile_duplicate(const struct PackedFile *pf_src); struct PackedFile *BKE_packedfile_new(struct ReportList *reports, - const char *filename, + const char *filepath, const char *basepath); struct PackedFile *BKE_packedfile_new_from_memory(void *mem, int memlen); @@ -102,7 +102,7 @@ int BKE_packedfile_unpack_all_libraries(struct Main *bmain, struct ReportList *r int BKE_packedfile_write_to_file(struct ReportList *reports, const char *ref_file_name, - const char *filename, + const char *filepath, struct PackedFile *pf, bool guimode); @@ -122,7 +122,7 @@ int BKE_packedfile_count_all(struct Main *bmain); * - #PF_NOFILE: the original file doesn't exist. */ enum ePF_FileCompare BKE_packedfile_compare_to_file(const char *ref_file_name, - const char *filename, + const char *filepath_rel, struct PackedFile *pf); /* Read. */ diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 8ec7bbea0e5..0f5814c0a23 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -3266,7 +3266,7 @@ static void dynamic_paint_output_surface_image_wetmap_cb( } void dynamicPaint_outputSurfaceImage(DynamicPaintSurface *surface, - char *filename, + const char *filepath, short output_layer) { ImBuf *ibuf = NULL; @@ -3286,7 +3286,7 @@ void dynamicPaint_outputSurfaceImage(DynamicPaintSurface *surface, format = R_IMF_IMTYPE_PNG; } #endif - BLI_strncpy(output_file, filename, sizeof(output_file)); + BLI_strncpy(output_file, filepath, sizeof(output_file)); BKE_image_path_ensure_ext_from_imtype(output_file, format); /* Validate output file path */ diff --git a/source/blender/blenkernel/intern/image_save.cc b/source/blender/blenkernel/intern/image_save.cc index 913b5553632..3d7889b43fa 100644 --- a/source/blender/blenkernel/intern/image_save.cc +++ b/source/blender/blenkernel/intern/image_save.cc @@ -486,7 +486,7 @@ static float *image_exr_from_scene_linear_to_output(float *rect, bool BKE_image_render_write_exr(ReportList *reports, const RenderResult *rr, - const char *filename, + const char *filepath, const ImageFormatData *imf, const bool save_as_render, const char *view, @@ -630,11 +630,11 @@ bool BKE_image_render_write_exr(ReportList *reports, errno = 0; - BLI_make_existing_file(filename); + BLI_make_existing_file(filepath); int compress = (imf ? imf->exr_codec : 0); bool success = IMB_exr_begin_write( - exrhandle, filename, rr->rectx, rr->recty, compress, rr->stamp_data); + exrhandle, filepath, rr->rectx, rr->recty, compress, rr->stamp_data); if (success) { IMB_exr_write_channels(exrhandle); } @@ -693,7 +693,7 @@ bool BKE_image_render_write(ReportList *reports, RenderResult *rr, const Scene *scene, const bool stamp, - const char *filename) + const char *filepath_basis) { bool ok = true; @@ -711,8 +711,8 @@ bool BKE_image_render_write(ReportList *reports, const float dither = scene->r.dither_intensity; if (image_format.views_format == R_IMF_VIEWS_MULTIVIEW && is_exr_rr) { - ok = BKE_image_render_write_exr(reports, rr, filename, &image_format, true, nullptr, -1); - image_render_print_save_message(reports, filename, ok, errno); + ok = BKE_image_render_write_exr(reports, rr, filepath_basis, &image_format, true, nullptr, -1); + image_render_print_save_message(reports, filepath_basis, ok, errno); } /* mono, legacy code */ @@ -722,10 +722,10 @@ bool BKE_image_render_write(ReportList *reports, rv = rv->next, view_id++) { char filepath[FILE_MAX]; if (is_mono) { - STRNCPY(filepath, filename); + STRNCPY(filepath, filepath_basis); } else { - BKE_scene_multiview_view_filepath_get(&scene->r, filename, rv->name, filepath); + BKE_scene_multiview_view_filepath_get(&scene->r, filepath_basis, rv->name, filepath); } if (is_exr_rr) { @@ -768,7 +768,7 @@ bool BKE_image_render_write(ReportList *reports, BLI_assert(image_format.views_format == R_IMF_VIEWS_STEREO_3D); char filepath[FILE_MAX]; - STRNCPY(filepath, filename); + STRNCPY(filepath, filepath_basis); if (image_format.imtype == R_IMF_IMTYPE_MULTILAYER) { printf("Stereo 3D not supported for MultiLayer image: %s\n", filepath); diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 4c5fefefd8e..e7ed100ed03 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -174,16 +174,16 @@ PackedFile *BKE_packedfile_new_from_memory(void *mem, int memlen) return pf; } -PackedFile *BKE_packedfile_new(ReportList *reports, const char *filename, const char *basepath) +PackedFile *BKE_packedfile_new(ReportList *reports, const char *filepath, const char *basepath) { PackedFile *pf = NULL; int file, filelen; char name[FILE_MAX]; void *data; - /* render result has no filename and can be ignored + /* render result has no filepath and can be ignored * any other files with no name can be ignored too */ - if (filename[0] == '\0') { + if (filepath[0] == '\0') { return pf; } @@ -191,7 +191,7 @@ PackedFile *BKE_packedfile_new(ReportList *reports, const char *filename, const /* convert relative filenames to absolute filenames */ - BLI_strncpy(name, filename, sizeof(name)); + BLI_strncpy(name, filepath, sizeof(name)); BLI_path_abs(name, basepath); /* open the file @@ -285,7 +285,7 @@ void BKE_packedfile_pack_all(Main *bmain, ReportList *reports, bool verbose) int BKE_packedfile_write_to_file(ReportList *reports, const char *ref_file_name, - const char *filename, + const char *filepath, PackedFile *pf, const bool guimode) { @@ -299,7 +299,7 @@ int BKE_packedfile_write_to_file(ReportList *reports, if (guimode) { } // XXX waitcursor(1); - BLI_strncpy(name, filename, sizeof(name)); + BLI_strncpy(name, filepath, sizeof(name)); BLI_path_abs(name, ref_file_name); if (BLI_exists(name)) { @@ -358,7 +358,7 @@ int BKE_packedfile_write_to_file(ReportList *reports, } enum ePF_FileCompare BKE_packedfile_compare_to_file(const char *ref_file_name, - const char *filename, + const char *filepath, PackedFile *pf) { BLI_stat_t st; @@ -366,7 +366,7 @@ enum ePF_FileCompare BKE_packedfile_compare_to_file(const char *ref_file_name, char buf[4096]; char name[FILE_MAX]; - BLI_strncpy(name, filename, sizeof(name)); + BLI_strncpy(name, filepath, sizeof(name)); BLI_path_abs(name, ref_file_name); if (BLI_stat(name, &st) == -1) { |