From 5685481fcbc44f0973d99b4e349a0714174ff3dd Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 28 Mar 2024 20:57:46 +1100 Subject: [PATCH] Cleanup: rename "name" to "filepath" for full paths --- source/blender/blenkernel/BKE_scene.hh | 2 +- source/blender/blenkernel/intern/scene.cc | 10 +++++----- source/blender/sequencer/intern/render.cc | 10 +++++++--- source/blender/sequencer/intern/strip_add.cc | 16 ++++++++-------- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/source/blender/blenkernel/BKE_scene.hh b/source/blender/blenkernel/BKE_scene.hh index a3b67807f57..af0237f93ed 100644 --- a/source/blender/blenkernel/BKE_scene.hh +++ b/source/blender/blenkernel/BKE_scene.hh @@ -283,7 +283,7 @@ void BKE_scene_multiview_view_filepath_get(const RenderData *rd, const char *BKE_scene_multiview_view_suffix_get(const RenderData *rd, const char *viewname); const char *BKE_scene_multiview_view_id_suffix_get(const RenderData *rd, int view_id); void BKE_scene_multiview_view_prefix_get(Scene *scene, - const char *name, + const char *filepath, char *r_prefix, const char **r_ext); void BKE_scene_multiview_videos_dimensions_get( diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index 50a1046c184..95fcdf49c72 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -3154,7 +3154,7 @@ const char *BKE_scene_multiview_view_id_suffix_get(const RenderData *rd, const i } void BKE_scene_multiview_view_prefix_get(Scene *scene, - const char *name, + const char *filepath, char *r_prefix, const char **r_ext) { @@ -3163,8 +3163,8 @@ void BKE_scene_multiview_view_prefix_get(Scene *scene, r_prefix[0] = '\0'; - /* Split filename into base name and extension. */ - const size_t basename_len = BLI_str_rpartition(name, delims, r_ext, &unused); + /* Split `filepath` into base name and extension. */ + const size_t basename_len = BLI_str_rpartition(filepath, delims, r_ext, &unused); if (*r_ext == nullptr) { return; } @@ -3175,9 +3175,9 @@ void BKE_scene_multiview_view_prefix_get(Scene *scene, if (BKE_scene_multiview_is_render_view_active(&scene->r, srv)) { const size_t suffix_len = strlen(srv->suffix); if (basename_len >= suffix_len && - STREQLEN(name + basename_len - suffix_len, srv->suffix, suffix_len)) + STREQLEN(filepath + basename_len - suffix_len, srv->suffix, suffix_len)) { - BLI_strncpy(r_prefix, name, basename_len - suffix_len + 1); + BLI_strncpy(r_prefix, filepath, basename_len - suffix_len + 1); break; } } diff --git a/source/blender/sequencer/intern/render.cc b/source/blender/sequencer/intern/render.cc index 6a32b00d56d..722c255e0c1 100644 --- a/source/blender/sequencer/intern/render.cc +++ b/source/blender/sequencer/intern/render.cc @@ -1014,11 +1014,15 @@ static ImBuf *seq_render_image_strip_view(const SeqRenderData *context, return ibuf; } -static bool seq_image_strip_is_multiview_render( - Scene *scene, Sequence *seq, int totfiles, char *name, char *r_prefix, const char *r_ext) +static bool seq_image_strip_is_multiview_render(Scene *scene, + Sequence *seq, + int totfiles, + const char *filepath, + char *r_prefix, + const char *r_ext) { if (totfiles > 1) { - BKE_scene_multiview_view_prefix_get(scene, name, r_prefix, &r_ext); + BKE_scene_multiview_view_prefix_get(scene, filepath, r_prefix, &r_ext); if (r_prefix[0] == '\0') { return false; } diff --git a/source/blender/sequencer/intern/strip_add.cc b/source/blender/sequencer/intern/strip_add.cc index d2b749465cd..f26cb25888b 100644 --- a/source/blender/sequencer/intern/strip_add.cc +++ b/source/blender/sequencer/intern/strip_add.cc @@ -381,9 +381,9 @@ Sequence *SEQ_add_meta_strip(Scene *scene, ListBase *seqbase, SeqLoadData *load_ Sequence *SEQ_add_movie_strip(Main *bmain, Scene *scene, ListBase *seqbase, SeqLoadData *load_data) { - char path[sizeof(load_data->path)]; - STRNCPY(path, load_data->path); - BLI_path_abs(path, BKE_main_blendfile_path(bmain)); + char filepath[sizeof(load_data->path)]; + STRNCPY(filepath, load_data->path); + BLI_path_abs(filepath, BKE_main_blendfile_path(bmain)); char colorspace[64] = "\0"; /* MAX_COLORSPACE_NAME */ bool is_multiview_loaded = false; @@ -399,14 +399,14 @@ Sequence *SEQ_add_movie_strip(Main *bmain, Scene *scene, ListBase *seqbase, SeqL const char *ext = nullptr; size_t j = 0; - BKE_scene_multiview_view_prefix_get(scene, path, prefix, &ext); + BKE_scene_multiview_view_prefix_get(scene, filepath, prefix, &ext); if (prefix[0] != '\0') { for (i = 0; i < totfiles; i++) { - char filepath[FILE_MAX]; + char filepath_view[FILE_MAX]; - seq_multiview_name(scene, i, prefix, ext, filepath, sizeof(filepath)); - anim_arr[j] = openanim(filepath, IB_rect, 0, colorspace); + seq_multiview_name(scene, i, prefix, ext, filepath_view, sizeof(filepath_view)); + anim_arr[j] = openanim(filepath_view, IB_rect, 0, colorspace); if (anim_arr[j]) { seq_anim_add_suffix(scene, anim_arr[j], i); @@ -418,7 +418,7 @@ Sequence *SEQ_add_movie_strip(Main *bmain, Scene *scene, ListBase *seqbase, SeqL } if (is_multiview_loaded == false) { - anim_arr[0] = openanim(path, IB_rect, 0, colorspace); + anim_arr[0] = openanim(filepath, IB_rect, 0, colorspace); } if (anim_arr[0] == nullptr && !load_data->allow_invalid_file) {