diff options
author | Jacques Lucke <jacques@blender.org> | 2020-11-06 16:27:51 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-11-06 16:28:33 +0300 |
commit | dfa027fe09b53485802cb0d6224ffc6bbc058b87 (patch) | |
tree | bfbb6c9db0f08fb0783e97ef2b232eeaa62c2136 /source/blender/blenloader | |
parent | 94ce248b30e8c43ac3108c2d670a1d6a42516f87 (diff) |
Refactor: move sequencer modifier .blend I/O to sequencer module
Ref T76372.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 35 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 27 |
2 files changed, 3 insertions, 59 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index ab6a178ec4d..727c2c02d2e 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3859,15 +3859,6 @@ static void composite_patch(bNodeTree *ntree, Scene *scene) } } -static void lib_link_sequence_modifiers(BlendLibReader *reader, Scene *scene, ListBase *lb) -{ - LISTBASE_FOREACH (SequenceModifierData *, smd, lb) { - if (smd->mask_id) { - BLO_read_id_address(reader, scene->id.lib, &smd->mask_id); - } - } -} - /* check for cyclic set-scene, * libs can cause this case which is normally prevented, see (T#####) */ #define USE_SETSCENE_CHECK @@ -4020,7 +4011,7 @@ static void lib_link_scene(BlendLibReader *reader, Scene *sce) } BLI_listbase_clear(&seq->anims); - lib_link_sequence_modifiers(reader, sce, &seq->modifiers); + BKE_sequence_modifier_blend_read_lib(reader, sce, &seq->modifiers); } SEQ_ALL_END; @@ -4124,28 +4115,6 @@ static void direct_link_paint_helper(BlendDataReader *reader, const Scene *scene } } -static void direct_link_sequence_modifiers(BlendDataReader *reader, ListBase *lb) -{ - BLO_read_list(reader, lb); - - LISTBASE_FOREACH (SequenceModifierData *, smd, lb) { - if (smd->mask_sequence) { - BLO_read_data_address(reader, &smd->mask_sequence); - } - - if (smd->type == seqModifierType_Curves) { - CurvesModifierData *cmd = (CurvesModifierData *)smd; - - BKE_curvemapping_blend_read(reader, &cmd->curve_mapping); - } - else if (smd->type == seqModifierType_HueCorrect) { - HueCorrectModifierData *hcmd = (HueCorrectModifierData *)smd; - - BKE_curvemapping_blend_read(reader, &hcmd->curve_mapping); - } - } -} - static void direct_link_scene(BlendDataReader *reader, Scene *sce) { sce->depsgraph_hash = NULL; @@ -4292,7 +4261,7 @@ static void direct_link_scene(BlendDataReader *reader, Scene *sce) BLO_read_data_address(reader, &seq->strip->color_balance); } - direct_link_sequence_modifiers(reader, &seq->modifiers); + BKE_sequence_modifier_blend_read_data(reader, &seq->modifiers); } SEQ_ALL_END; diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index e9cb115a2c5..0a431e8dda1 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1292,31 +1292,6 @@ static void write_object(BlendWriter *writer, Object *ob, const void *id_address } } -static void write_sequence_modifiers(BlendWriter *writer, ListBase *modbase) -{ - LISTBASE_FOREACH (SequenceModifierData *, smd, modbase) { - const SequenceModifierTypeInfo *smti = BKE_sequence_modifier_type_info_get(smd->type); - - if (smti) { - BLO_write_struct_by_name(writer, smti->struct_name, smd); - - if (smd->type == seqModifierType_Curves) { - CurvesModifierData *cmd = (CurvesModifierData *)smd; - - BKE_curvemapping_blend_write(writer, &cmd->curve_mapping); - } - else if (smd->type == seqModifierType_HueCorrect) { - HueCorrectModifierData *hcmd = (HueCorrectModifierData *)smd; - - BKE_curvemapping_blend_write(writer, &hcmd->curve_mapping); - } - } - else { - BLO_write_struct(writer, SequenceModifierData, smd); - } - } -} - static void write_scene(BlendWriter *writer, Scene *sce, const void *id_address) { if (BLO_write_is_undo(writer)) { @@ -1467,7 +1442,7 @@ static void write_scene(BlendWriter *writer, Scene *sce, const void *id_address) IDP_BlendWrite(writer, seq->prop); } - write_sequence_modifiers(writer, &seq->modifiers); + BKE_sequence_modifier_blend_write(writer, &seq->modifiers); } SEQ_ALL_END; |