From c624e56ffce681cdef142e8ace603684e9871663 Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Fri, 17 Feb 2023 09:36:16 +0100 Subject: [PATCH] Fix #104810: Appending a camera does not pull in background movie clip This was broken even before 0649e6371629 and was always expanding the `Image`, not the movie clip (even if the source was set to `CAM_BGIMG_SOURCE_MOVIE`) Now the rule here seems to be to always expand unconditionally, so remove checking the source and always expand image and movie clip. Co-authored-by: Philipp Oeser Pull Request #104815 --- source/blender/blenkernel/intern/camera.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index 47f031e8dca..0ad00591d6d 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -159,12 +159,8 @@ static void camera_blend_read_expand(BlendExpander *expander, ID *id) BLO_expand(expander, ca->ipo); // XXX deprecated - old animation system LISTBASE_FOREACH (CameraBGImage *, bgpic, &ca->bg_images) { - if (bgpic->source == CAM_BGIMG_SOURCE_IMAGE) { - BLO_expand(expander, bgpic->ima); - } - else if (bgpic->source == CAM_BGIMG_SOURCE_MOVIE) { - BLO_expand(expander, bgpic->ima); - } + BLO_expand(expander, bgpic->ima); + BLO_expand(expander, bgpic->clip); } }