From f26d7268bf85bd9fb492713fee0c746f302556e3 Mon Sep 17 00:00:00 2001 From: Richard Antalik Date: Fri, 26 Jun 2020 15:38:50 +0200 Subject: Silence warning introduced in f7f3b2d31823 Call function `BKE_scene_multiview_view_prefix_get` to ensure ext is not NULL. This already should happen in `seq_image_strip_is_multiview_render` though. Reviewed By: sergey Differential Revision: https://developer.blender.org/D8081 --- source/blender/blenkernel/intern/sequencer.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/blenkernel/intern/sequencer.c') diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 096f6fa6bc6..6732b47d473 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -912,6 +912,7 @@ static void seq_multiview_name(Scene *scene, size_t r_size) { const char *suffix = BKE_scene_multiview_view_id_suffix_get(&scene->r, view_id); + BLI_assert(ext != NULL && suffix != NULL && prefix != NULL); BLI_snprintf(r_path, r_size, "%s%s%s", prefix, suffix, ext); } @@ -3013,6 +3014,7 @@ static ImBuf *seq_render_image_strip_view(const SeqRenderData *context, } else { char str[FILE_MAX]; + BKE_scene_multiview_view_prefix_get(context->scene, name, prefix, &ext); seq_multiview_name(context->scene, view_id, prefix, ext, str, FILE_MAX); ibuf = IMB_loadiffname(str, flag, seq->strip->colorspace_settings.name); } -- cgit v1.2.3