From 0e021414fe9921164bd96340be8d9e2c49e4669a Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Fri, 28 Aug 2020 13:18:24 +0200 Subject: Cleanup: improve function names With this change, the three .blend read operations: data reading, lib reading and expanding are more grouped together. --- source/blender/blenkernel/intern/fcurve.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'source/blender/blenkernel/intern/fcurve.c') diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index ba4a1e7b310..294e6f8c8a0 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -2047,7 +2047,7 @@ void BKE_fmodifiers_blend_write(BlendWriter *writer, ListBase *fmodifiers) } } -void BKE_fmodifiers_blend_data_read(BlendDataReader *reader, ListBase *fmodifiers, FCurve *curve) +void BKE_fmodifiers_blend_read_data(BlendDataReader *reader, ListBase *fmodifiers, FCurve *curve) { LISTBASE_FOREACH (FModifier *, fcm, fmodifiers) { /* relink general data */ @@ -2080,7 +2080,7 @@ void BKE_fmodifiers_blend_data_read(BlendDataReader *reader, ListBase *fmodifier } } -void BKE_fmodifiers_blend_lib_read(BlendLibReader *reader, ID *id, ListBase *fmodifiers) +void BKE_fmodifiers_blend_read_lib(BlendLibReader *reader, ID *id, ListBase *fmodifiers) { LISTBASE_FOREACH (FModifier *, fcm, fmodifiers) { /* data for specific modifiers */ @@ -2094,7 +2094,7 @@ void BKE_fmodifiers_blend_lib_read(BlendLibReader *reader, ID *id, ListBase *fmo } } -void BKE_fmodifiers_blend_expand(BlendExpander *expander, ListBase *fmodifiers) +void BKE_fmodifiers_blend_read_expand(BlendExpander *expander, ListBase *fmodifiers) { LISTBASE_FOREACH (FModifier *, fcm, fmodifiers) { /* library data for specific F-Modifier types */ @@ -2147,7 +2147,7 @@ void BKE_fcurve_blend_write(BlendWriter *writer, ListBase *fcurves) } } -void BKE_fcurve_blend_data_read(BlendDataReader *reader, ListBase *fcurves) +void BKE_fcurve_blend_read_data(BlendDataReader *reader, ListBase *fcurves) { /* link F-Curve data to F-Curve again (non ID-libs) */ LISTBASE_FOREACH (FCurve *, fcu, fcurves) { @@ -2199,11 +2199,11 @@ void BKE_fcurve_blend_data_read(BlendDataReader *reader, ListBase *fcurves) /* modifiers */ BLO_read_list(reader, &fcu->modifiers); - BKE_fmodifiers_blend_data_read(reader, &fcu->modifiers, fcu); + BKE_fmodifiers_blend_read_data(reader, &fcu->modifiers, fcu); } } -void BKE_fcurve_blend_lib_read(BlendLibReader *reader, ID *id, ListBase *fcurves) +void BKE_fcurve_blend_read_lib(BlendLibReader *reader, ID *id, ListBase *fcurves) { if (fcurves == NULL) { return; @@ -2229,11 +2229,11 @@ void BKE_fcurve_blend_lib_read(BlendLibReader *reader, ID *id, ListBase *fcurves } /* modifiers */ - BKE_fmodifiers_blend_lib_read(reader, id, &fcu->modifiers); + BKE_fmodifiers_blend_read_lib(reader, id, &fcu->modifiers); } } -void BKE_fcurve_blend_expand(BlendExpander *expander, ListBase *fcurves) +void BKE_fcurve_blend_read_expand(BlendExpander *expander, ListBase *fcurves) { LISTBASE_FOREACH (FCurve *, fcu, fcurves) { /* Driver targets if there is a driver */ @@ -2250,7 +2250,7 @@ void BKE_fcurve_blend_expand(BlendExpander *expander, ListBase *fcurves) } /* F-Curve Modifiers */ - BKE_fmodifiers_blend_expand(expander, &fcu->modifiers); + BKE_fmodifiers_blend_read_expand(expander, &fcu->modifiers); } } -- cgit v1.2.3