From 5e2bad158956f900344b9b09ade152c41725f142 Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Thu, 1 Feb 2024 09:50:48 +0100 Subject: [PATCH] Fix #117674: stereoscopy rendering with overwrite disabled broken This would still overwrite (even though frames existed). Mistake in 6b9a500a3a. char "filepath" was already in use/shadowed, instead use "filepath_view" to correctly glue path/suffix together (as done already a bit below for the R_TOUCH case). Pull Request: https://projects.blender.org/blender/blender/pulls/117696 --- source/blender/render/intern/pipeline.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc index 6ad31d84dd0..ebe4a65c13d 100644 --- a/source/blender/render/intern/pipeline.cc +++ b/source/blender/render/intern/pipeline.cc @@ -2403,18 +2403,17 @@ void RE_RenderAnim(Render *re, } else { bool is_skip = false; - char filepath[FILE_MAX]; + char filepath_view[FILE_MAX]; LISTBASE_FOREACH (SceneRenderView *, srv, &scene->r.views) { if (!BKE_scene_multiview_is_render_view_active(&scene->r, srv)) { continue; } - BKE_scene_multiview_filepath_get(srv, filepath, filepath); - - if (BLI_exists(filepath)) { + BKE_scene_multiview_filepath_get(srv, filepath, filepath_view); + if (BLI_exists(filepath_view)) { is_skip = true; - printf("skipping existing frame \"%s\" for view \"%s\"\n", filepath, srv->name); + printf("skipping existing frame \"%s\" for view \"%s\"\n", filepath_view, srv->name); } }