[Bf-blender-cvs] [e59f7053082] master: Fix T64981: background images do not come along with linked cameras

Brecht Van Lommel noreply at git.blender.org
Wed May 22 10:46:10 CEST 2019


Commit: e59f705308249fa640d7a19a0b2c1ea24382070e
Author: Brecht Van Lommel
Date:   Wed May 22 10:44:02 2019 +0200
Branches: master
https://developer.blender.org/rBe59f705308249fa640d7a19a0b2c1ea24382070e

Fix T64981: background images do not come along with linked cameras

===================================================================

M	source/blender/blenloader/intern/readfile.c

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 77deb8658cd..5edba272cd4 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -10775,6 +10775,15 @@ static void expand_camera(FileData *fd, Main *mainvar, Camera *ca)
 {
   expand_doit(fd, mainvar, ca->ipo);  // XXX deprecated - old animation system
 
+  for (CameraBGImage *bgpic = ca->bg_images.first; bgpic; bgpic = bgpic->next) {
+    if (bgpic->source == CAM_BGIMG_SOURCE_IMAGE) {
+      expand_doit(fd, mainvar, bgpic->ima);
+    }
+    else if (bgpic->source == CAM_BGIMG_SOURCE_MOVIE) {
+      expand_doit(fd, mainvar, bgpic->ima);
+    }
+  }
+
   if (ca->adt) {
     expand_animdata(fd, mainvar, ca->adt);
   }



More information about the Bf-blender-cvs mailing list