[Bf-blender-cvs] [0e021414fe9] master: Cleanup: improve function names
Jacques Lucke
noreply at git.blender.org
Fri Aug 28 13:18:34 CEST 2020
Commit: 0e021414fe9921164bd96340be8d9e2c49e4669a
Author: Jacques Lucke
Date: Fri Aug 28 13:18:24 2020 +0200
Branches: master
https://developer.blender.org/rB0e021414fe9921164bd96340be8d9e2c49e4669a
Cleanup: improve function names
With this change, the three .blend read operations: data reading, lib reading
and expanding are more grouped together.
===================================================================
M source/blender/blenkernel/BKE_anim_data.h
M source/blender/blenkernel/BKE_fcurve.h
M source/blender/blenkernel/BKE_idprop.h
M source/blender/blenkernel/BKE_nla.h
M source/blender/blenkernel/intern/anim_data.c
M source/blender/blenkernel/intern/fcurve.c
M source/blender/blenkernel/intern/idprop.c
M source/blender/blenkernel/intern/nla.c
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_anim_data.h b/source/blender/blenkernel/BKE_anim_data.h
index 587262306fe..8507793b1dc 100644
--- a/source/blender/blenkernel/BKE_anim_data.h
+++ b/source/blender/blenkernel/BKE_anim_data.h
@@ -99,11 +99,11 @@ void BKE_animdata_merge_copy(struct Main *bmain,
bool fix_drivers);
void BKE_animdata_blend_write(struct BlendWriter *writer, struct AnimData *adt);
-void BKE_animdata_blend_data_read(struct BlendDataReader *reader, struct AnimData *adt);
-void BKE_animdata_blend_lib_read(struct BlendLibReader *reader,
+void BKE_animdata_blend_read_data(struct BlendDataReader *reader, struct AnimData *adt);
+void BKE_animdata_blend_read_lib(struct BlendLibReader *reader,
struct ID *id,
struct AnimData *adt);
-void BKE_animdata_blend_expand(struct BlendExpander *expander, struct AnimData *adt);
+void BKE_animdata_blend_read_expand(struct BlendExpander *expander, struct AnimData *adt);
#ifdef __cplusplus
}
diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.h
index 831b5d17412..b316fc28726 100644
--- a/source/blender/blenkernel/BKE_fcurve.h
+++ b/source/blender/blenkernel/BKE_fcurve.h
@@ -318,20 +318,20 @@ void fcurve_store_samples(
/* ************* F-Curve .blend file API ******************** */
void BKE_fmodifiers_blend_write(struct BlendWriter *writer, struct ListBase *fmodifiers);
-void BKE_fmodifiers_blend_data_read(struct BlendDataReader *reader,
+void BKE_fmodifiers_blend_read_data(struct BlendDataReader *reader,
ListBase *fmodifiers,
struct FCurve *curve);
-void BKE_fmodifiers_blend_lib_read(struct BlendLibReader *reader,
+void BKE_fmodifiers_blend_read_lib(struct BlendLibReader *reader,
struct ID *id,
struct ListBase *fmodifiers);
-void BKE_fmodifiers_blend_expand(struct BlendExpander *expander, struct ListBase *fmodifiers);
+void BKE_fmodifiers_blend_read_expand(struct BlendExpander *expander, struct ListBase *fmodifiers);
void BKE_fcurve_blend_write(struct BlendWriter *writer, struct ListBase *fcurves);
-void BKE_fcurve_blend_data_read(struct BlendDataReader *reader, struct ListBase *fcurves);
-void BKE_fcurve_blend_lib_read(struct BlendLibReader *reader,
+void BKE_fcurve_blend_read_data(struct BlendDataReader *reader, struct ListBase *fcurves);
+void BKE_fcurve_blend_read_lib(struct BlendLibReader *reader,
struct ID *id,
struct ListBase *fcurves);
-void BKE_fcurve_blend_expand(struct BlendExpander *expander, struct ListBase *fcurves);
+void BKE_fcurve_blend_read_expand(struct BlendExpander *expander, struct ListBase *fcurves);
#ifdef __cplusplus
}
diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h
index c71602e10b2..e7f9ad207a1 100644
--- a/source/blender/blenkernel/BKE_idprop.h
+++ b/source/blender/blenkernel/BKE_idprop.h
@@ -201,12 +201,12 @@ void IDP_repr_fn(const IDProperty *prop,
void IDP_print(const struct IDProperty *prop);
void IDP_BlendWrite(struct BlendWriter *writer, const struct IDProperty *prop);
-void IDP_BlendDataRead_impl(struct BlendDataReader *reader,
+void IDP_BlendReadData_impl(struct BlendDataReader *reader,
IDProperty **prop,
const char *caller_func_id);
-#define IDP_BlendDataRead(reader, prop) IDP_BlendDataRead_impl(reader, prop, __func__)
-void IDP_BlendLibRead(struct BlendLibReader *reader, IDProperty *prop);
-void IDP_BlendExpand(struct BlendExpander *expander, IDProperty *prop);
+#define IDP_BlendDataRead(reader, prop) IDP_BlendReadData_impl(reader, prop, __func__)
+void IDP_BlendReadLib(struct BlendLibReader *reader, IDProperty *prop);
+void IDP_BlendReadExpand(struct BlendExpander *expander, IDProperty *prop);
#ifdef __cplusplus
}
diff --git a/source/blender/blenkernel/BKE_nla.h b/source/blender/blenkernel/BKE_nla.h
index 846be31dd34..4cded6b9d6a 100644
--- a/source/blender/blenkernel/BKE_nla.h
+++ b/source/blender/blenkernel/BKE_nla.h
@@ -154,9 +154,9 @@ float BKE_nla_tweakedit_remap(struct AnimData *adt, float cframe, short mode);
/* .blend file API */
void BKE_nla_blend_write(struct BlendWriter *writer, struct ListBase *tracks);
-void BKE_nla_blend_data_read(struct BlendDataReader *reader, struct ListBase *tracks);
-void BKE_nla_blend_lib_read(struct BlendLibReader *reader, struct ID *id, struct ListBase *tracks);
-void BKE_nla_blend_expand(struct BlendExpander *expander, struct ListBase *tracks);
+void BKE_nla_blend_read_data(struct BlendDataReader *reader, struct ListBase *tracks);
+void BKE_nla_blend_read_lib(struct BlendLibReader *reader, struct ID *id, struct ListBase *tracks);
+void BKE_nla_blend_read_expand(struct BlendExpander *expander, struct ListBase *tracks);
#ifdef __cplusplus
}
diff --git a/source/blender/blenkernel/intern/anim_data.c b/source/blender/blenkernel/intern/anim_data.c
index 875c97e2895..5ce449c5000 100644
--- a/source/blender/blenkernel/intern/anim_data.c
+++ b/source/blender/blenkernel/intern/anim_data.c
@@ -1524,7 +1524,7 @@ void BKE_animdata_blend_write(BlendWriter *writer, struct AnimData *adt)
BKE_nla_blend_write(writer, &adt->nla_tracks);
}
-void BKE_animdata_blend_data_read(BlendDataReader *reader, AnimData *adt)
+void BKE_animdata_blend_read_data(BlendDataReader *reader, AnimData *adt)
{
/* NOTE: must have called BLO_read_data_address already before doing this... */
if (adt == NULL) {
@@ -1533,7 +1533,7 @@ void BKE_animdata_blend_data_read(BlendDataReader *reader, AnimData *adt)
/* link drivers */
BLO_read_list(reader, &adt->drivers);
- BKE_fcurve_blend_data_read(reader, &adt->drivers);
+ BKE_fcurve_blend_read_data(reader, &adt->drivers);
adt->driver_array = NULL;
/* link overrides */
@@ -1541,7 +1541,7 @@ void BKE_animdata_blend_data_read(BlendDataReader *reader, AnimData *adt)
/* link NLA-data */
BLO_read_list(reader, &adt->nla_tracks);
- BKE_nla_blend_data_read(reader, &adt->nla_tracks);
+ BKE_nla_blend_read_data(reader, &adt->nla_tracks);
/* relink active track/strip - even though strictly speaking this should only be used
* if we're in 'tweaking mode', we need to be able to have this loaded back for
@@ -1553,7 +1553,7 @@ void BKE_animdata_blend_data_read(BlendDataReader *reader, AnimData *adt)
BLO_read_data_address(reader, &adt->actstrip);
}
-void BKE_animdata_blend_lib_read(BlendLibReader *reader, ID *id, AnimData *adt)
+void BKE_animdata_blend_read_lib(BlendLibReader *reader, ID *id, AnimData *adt)
{
if (adt == NULL) {
return;
@@ -1564,20 +1564,20 @@ void BKE_animdata_blend_lib_read(BlendLibReader *reader, ID *id, AnimData *adt)
BLO_read_id_address(reader, id->lib, &adt->tmpact);
/* link drivers */
- BKE_fcurve_blend_lib_read(reader, id, &adt->drivers);
+ BKE_fcurve_blend_read_lib(reader, id, &adt->drivers);
/* overrides don't have lib-link for now, so no need to do anything */
/* link NLA-data */
- BKE_nla_blend_lib_read(reader, id, &adt->nla_tracks);
+ BKE_nla_blend_read_lib(reader, id, &adt->nla_tracks);
}
-void BKE_animdata_blend_expand(struct BlendExpander *expander, AnimData *adt)
+void BKE_animdata_blend_read_expand(struct BlendExpander *expander, AnimData *adt)
{
/* own action */
BLO_expand(expander, adt->action);
BLO_expand(expander, adt->tmpact);
/* drivers - assume that these F-Curves have driver data to be in this list... */
- BKE_fcurve_blend_expand(expander, &adt->drivers);
+ BKE_fcurve_blend_read_expand(expander, &adt->drivers);
}
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(
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list