1 files changed, 75 insertions, 11 deletions

diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index 45d44a6829e..4fe3ddc81a1 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -24,6 +24,9 @@
 #include <stddef.h>
 #include <stdlib.h>
 
+/* Allow using deprecated functionality for .blend file I/O. */
+#define DNA_DEPRECATED_ALLOW
+
 #include "DNA_ID.h"
 #include "DNA_camera_types.h"
 #include "DNA_defaults.h"
@@ -38,6 +41,7 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
+#include "BKE_anim_data.h"
 #include "BKE_camera.h"
 #include "BKE_idtype.h"
 #include "BKE_layer.h"
@@ -54,6 +58,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLO_read_write.h"
+
 /* -------------------------------------------------------------------- */
 /** \name Camera Data-Block
  * \{ */
@@ -113,6 +119,67 @@ static void camera_foreach_id(ID *id, LibraryForeachIDData *data)
   }
 }
 
+static void camera_blend_write(BlendWriter *writer, ID *id, const void *id_address)
+{
+  Camera *cam = (Camera *)id;
+  if (cam->id.us > 0 || BLO_write_is_undo(writer)) {
+    /* write LibData */
+    BLO_write_id_struct(writer, Camera, id_address, &cam->id);
+    BKE_id_blend_write(writer, &cam->id);
+
+    if (cam->adt) {
+      BKE_animdata_blend_write(writer, cam->adt);
+    }
+
+    LISTBASE_FOREACH (CameraBGImage *, bgpic, &cam->bg_images) {
+      BLO_write_struct(writer, CameraBGImage, bgpic);
+    }
+  }
+}
+
+static void camera_blend_read_data(BlendDataReader *reader, ID *id)
+{
+  Camera *ca = (Camera *)id;
+  BLO_read_data_address(reader, &ca->adt);
+  BKE_animdata_blend_read_data(reader, ca->adt);
+
+  BLO_read_list(reader, &ca->bg_images);
+
+  LISTBASE_FOREACH (CameraBGImage *, bgpic, &ca->bg_images) {
+    bgpic->iuser.ok = 1;
+    bgpic->iuser.scene = NULL;
+  }
+}
+
+static void camera_blend_read_lib(BlendLibReader *reader, ID *id)
+{
+  Camera *ca = (Camera *)id;
+  BLO_read_id_address(reader, ca->id.lib, &ca->ipo); /* deprecated, for versioning */
+
+  BLO_read_id_address(reader, ca->id.lib, &ca->dof_ob); /* deprecated, for versioning */
+  BLO_read_id_address(reader, ca->id.lib, &ca->dof.focus_object);
+
+  LISTBASE_FOREACH (CameraBGImage *, bgpic, &ca->bg_images) {
+    BLO_read_id_address(reader, ca->id.lib, &bgpic->ima);
+    BLO_read_id_address(reader, ca->id.lib, &bgpic->clip);
+  }
+}
+
+static void camera_blend_read_expand(BlendExpander *expander, ID *id)
+{
+  Camera *ca = (Camera *)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);
+    }
+  }
+}
+
 IDTypeInfo IDType_ID_CA = {
     .id_code = ID_CA,
     .id_filter = FILTER_ID_CA,
@@ -130,10 +197,10 @@ IDTypeInfo IDType_ID_CA = {
     .foreach_id = camera_foreach_id,
     .foreach_cache = NULL,
 
-    .blend_write = NULL,
-    .blend_read_data = NULL,
-    .blend_read_lib = NULL,
-    .blend_read_expand = NULL,
+    .blend_write = camera_blend_write,
+    .blend_read_data = camera_blend_read_data,
+    .blend_read_lib = camera_blend_read_lib,
+    .blend_read_expand = camera_blend_read_expand,
 };
 
 /** \} */
@@ -527,9 +594,8 @@ typedef struct CameraViewFrameData {
 static void camera_to_frame_view_cb(const float co[3], void *user_data)
 {
   CameraViewFrameData *data = (CameraViewFrameData *)user_data;
-  unsigned int i;
 
-  for (i = 0; i < CAMERA_VIEWFRAME_NUM_PLANES; i++) {
+  for (uint i = 0; i < CAMERA_VIEWFRAME_NUM_PLANES; i++) {
     const float nd = dist_signed_squared_to_plane_v3(co, data->plane_tx[i]);
     CLAMP_MAX(data->dist_vals_sq[i], nd);
   }
@@ -548,7 +614,6 @@ static void camera_frame_fit_data_init(const Scene *scene,
                                        CameraViewFrameData *data)
 {
   float camera_rotmat_transposed_inversed[4][4];
-  unsigned int i;
 
   /* setup parameters */
   BKE_camera_params_init(params);
@@ -585,7 +650,7 @@ static void camera_frame_fit_data_init(const Scene *scene,
       NULL);
 
   /* Rotate planes and get normals from them */
-  for (i = 0; i < CAMERA_VIEWFRAME_NUM_PLANES; i++) {
+  for (uint i = 0; i < CAMERA_VIEWFRAME_NUM_PLANES; i++) {
     mul_m4_v4(camera_rotmat_transposed_inversed, data->plane_tx[i]);
     normalize_v3_v3(data->normal_tx[i], data->plane_tx[i]);
   }
@@ -606,7 +671,6 @@ static bool camera_frame_fit_calc_from_data(CameraParams *params,
                                             float *r_scale)
 {
   float plane_tx[CAMERA_VIEWFRAME_NUM_PLANES][4];
-  unsigned int i;
 
   if (data->tot <= 1) {
     return false;
@@ -620,7 +684,7 @@ static bool camera_frame_fit_calc_from_data(CameraParams *params,
     float scale_diff;
 
     /* apply the dist-from-plane's to the transformed plane points */
-    for (i = 0; i < CAMERA_VIEWFRAME_NUM_PLANES; i++) {
+    for (int i = 0; i < CAMERA_VIEWFRAME_NUM_PLANES; i++) {
       dists[i] = sqrtf_signed(data->dist_vals_sq[i]);
     }
 
@@ -648,7 +712,7 @@ static bool camera_frame_fit_calc_from_data(CameraParams *params,
   float plane_isect_pt_1[3], plane_isect_pt_2[3];
 
   /* apply the dist-from-plane's to the transformed plane points */
-  for (i = 0; i < CAMERA_VIEWFRAME_NUM_PLANES; i++) {
+  for (int i = 0; i < CAMERA_VIEWFRAME_NUM_PLANES; i++) {
     float co[3];
     mul_v3_v3fl(co, data->normal_tx[i], sqrtf_signed(data->dist_vals_sq[i]));
     plane_from_point_normal_v3(plane_tx[i], co, data->normal_tx[i]);