Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-09-10 16:59:00 +0300
committerJacques Lucke <jacques@blender.org>2020-09-10 16:59:08 +0300
commitede094f9b207209fbd8e1d52160189ef1ed0a8c1 (patch)
tree4e92cedc0bcbf66ffa9fa72e16f0c1484ed21690 /source/blender/blenloader/intern/writefile.c
parent405a5d3bd7ada5dd5af605b59ba07c7144f144a2 (diff)
Refactor: move Image .blend I/O to IDTypeInfo callbacks
Diffstat (limited to 'source/blender/blenloader/intern/writefile.c')
-rw-r--r--source/blender/blenloader/intern/writefile.c40
1 files changed, 1 insertions, 39 deletions
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 8efc181cbfc..6cab51dd03d 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1505,42 +1505,6 @@ static void write_curve(BlendWriter *writer, Curve *cu, const void *id_address)
}
}
-static void write_image(BlendWriter *writer, Image *ima, const void *id_address)
-{
- if (ima->id.us > 0 || BLO_write_is_undo(writer)) {
- ImagePackedFile *imapf;
-
- /* Some trickery to keep forward compatibility of packed images. */
- BLI_assert(ima->packedfile == NULL);
- if (ima->packedfiles.first != NULL) {
- imapf = ima->packedfiles.first;
- ima->packedfile = imapf->packedfile;
- }
-
- /* write LibData */
- BLO_write_id_struct(writer, Image, id_address, &ima->id);
- BKE_id_blend_write(writer, &ima->id);
-
- for (imapf = ima->packedfiles.first; imapf; imapf = imapf->next) {
- BLO_write_struct(writer, ImagePackedFile, imapf);
- BKE_packedfile_blend_write(writer, imapf->packedfile);
- }
-
- BKE_previewimg_blend_write(writer, ima->preview);
-
- LISTBASE_FOREACH (ImageView *, iv, &ima->views) {
- BLO_write_struct(writer, ImageView, iv);
- }
- BLO_write_struct(writer, Stereo3dFormat, ima->stereo3d_format);
-
- BLO_write_struct_list(writer, ImageTile, &ima->tiles);
-
- ima->packedfile = NULL;
-
- BLO_write_struct_list(writer, RenderSlot, &ima->renderslots);
- }
-}
-
static void write_texture(BlendWriter *writer, Tex *tex, const void *id_address)
{
if (tex->id.us > 0 || BLO_write_is_undo(writer)) {
@@ -2925,9 +2889,6 @@ static bool write_file_handle(Main *mainvar,
case ID_MB:
write_mball(&writer, (MetaBall *)id_buffer, id);
break;
- case ID_IM:
- write_image(&writer, (Image *)id_buffer, id);
- break;
case ID_CA:
write_camera(&writer, (Camera *)id_buffer, id);
break;
@@ -2996,6 +2957,7 @@ static bool write_file_handle(Main *mainvar,
case ID_PC:
case ID_PAL:
case ID_BR:
+ case ID_IM:
/* Do nothing, handled in IDTypeInfo callback. */
break;
case ID_LI: