[Bf-blender-cvs] [150950e30f0] blenloader-decentralization: simplify naming
Jacques Lucke
noreply at git.blender.org
Thu Apr 30 17:58:17 CEST 2020
Commit: 150950e30f0841924503c2cb3461be008721f982
Author: Jacques Lucke
Date: Thu Apr 30 17:58:10 2020 +0200
Branches: blenloader-decentralization
https://developer.blender.org/rB150950e30f0841924503c2cb3461be008721f982
simplify naming
===================================================================
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenloader/intern/readfile.c
M source/blender/modifiers/intern/MOD_armature.c
M source/blender/modifiers/intern/MOD_array.c
M source/blender/modifiers/intern/MOD_bevel.c
M source/blender/modifiers/intern/MOD_boolean.c
M source/blender/modifiers/intern/MOD_build.c
M source/blender/modifiers/intern/MOD_cast.c
M source/blender/modifiers/intern/MOD_cloth.c
M source/blender/modifiers/intern/MOD_collision.c
M source/blender/modifiers/intern/MOD_correctivesmooth.c
M source/blender/modifiers/intern/MOD_curve.c
M source/blender/modifiers/intern/MOD_datatransfer.c
M source/blender/modifiers/intern/MOD_decimate.c
M source/blender/modifiers/intern/MOD_displace.c
M source/blender/modifiers/intern/MOD_dynamicpaint.c
M source/blender/modifiers/intern/MOD_edgesplit.c
M source/blender/modifiers/intern/MOD_explode.c
M source/blender/modifiers/intern/MOD_fluid.c
M source/blender/modifiers/intern/MOD_hook.c
M source/blender/modifiers/intern/MOD_laplaciandeform.c
M source/blender/modifiers/intern/MOD_laplaciansmooth.c
M source/blender/modifiers/intern/MOD_lattice.c
M source/blender/modifiers/intern/MOD_mask.cc
M source/blender/modifiers/intern/MOD_meshcache.c
M source/blender/modifiers/intern/MOD_meshdeform.c
M source/blender/modifiers/intern/MOD_meshsequencecache.c
M source/blender/modifiers/intern/MOD_mirror.c
M source/blender/modifiers/intern/MOD_multires.c
M source/blender/modifiers/intern/MOD_none.c
M source/blender/modifiers/intern/MOD_normal_edit.c
M source/blender/modifiers/intern/MOD_ocean.c
M source/blender/modifiers/intern/MOD_particleinstance.c
M source/blender/modifiers/intern/MOD_particlesystem.c
M source/blender/modifiers/intern/MOD_remesh.c
M source/blender/modifiers/intern/MOD_screw.c
M source/blender/modifiers/intern/MOD_shapekey.c
M source/blender/modifiers/intern/MOD_shrinkwrap.c
M source/blender/modifiers/intern/MOD_simpledeform.c
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/modifiers/intern/MOD_smooth.c
M source/blender/modifiers/intern/MOD_softbody.c
M source/blender/modifiers/intern/MOD_solidify.c
M source/blender/modifiers/intern/MOD_subsurf.c
M source/blender/modifiers/intern/MOD_surface.c
M source/blender/modifiers/intern/MOD_surfacedeform.c
M source/blender/modifiers/intern/MOD_triangulate.c
M source/blender/modifiers/intern/MOD_uvproject.c
M source/blender/modifiers/intern/MOD_uvwarp.c
M source/blender/modifiers/intern/MOD_warp.c
M source/blender/modifiers/intern/MOD_wave.c
M source/blender/modifiers/intern/MOD_weighted_normal.c
M source/blender/modifiers/intern/MOD_weightvgedit.c
M source/blender/modifiers/intern/MOD_weightvgmix.c
M source/blender/modifiers/intern/MOD_weightvgproximity.c
M source/blender/modifiers/intern/MOD_weld.c
M source/blender/modifiers/intern/MOD_wireframe.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 3f7a972d361..d379a601bcd 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -364,7 +364,7 @@ typedef struct ModifierTypeInfo {
* It can be used to update pointers to arrays and other structs. Furthermore, fields that have
* not been written (e.g. runtime data) can be reset.
*/
- void (*blendReadData)(struct BlendDataReader *reader, struct ModifierData *md);
+ void (*blendRead)(struct BlendDataReader *reader, struct ModifierData *md);
} ModifierTypeInfo;
/* Initialize modifier's global data (type info and some common global storages). */
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 4ed8c9279eb..730b3642ed5 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5008,10 +5008,10 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb, Object *ob)
if (is_allocated) {
/* All the fields has been properly allocated. */
}
- else if (mdi && mdi->blendReadData) {
+ else if (mdi && mdi->blendRead) {
BlendDataReader reader;
reader.fd = fd;
- mdi->blendReadData(&reader, md);
+ mdi->blendRead(&reader, md);
}
else if (md->type == eModifierType_Fluid) {
@@ -8643,6 +8643,10 @@ static bool direct_link_id(FileData *fd, Main *main, const int tag, ID *id, ID *
case ID_SIM:
direct_link_simulation(fd, (Simulation *)id);
break;
+ case ID_AC:
+ case ID_KE:
+ /* Handled in type info callback. */
+ break;
}
return success;
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c
index 0d033e9695d..e563e405215 100644
--- a/source/blender/modifiers/intern/MOD_armature.c
+++ b/source/blender/modifiers/intern/MOD_armature.c
@@ -126,7 +126,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
DEG_add_modifier_to_transform_relation(ctx->node, "Armature Modifier");
}
-static void blendReadData(BlendDataReader *UNUSED(reader), ModifierData *md)
+static void blendRead(BlendDataReader *UNUSED(reader), ModifierData *md)
{
ArmatureModifierData *amd = (ArmatureModifierData *)md;
amd->prevCos = NULL;
@@ -278,5 +278,5 @@ ModifierTypeInfo modifierType_Armature = {
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
/* blendWrite */ NULL,
- /* blendReadData */ blendReadData,
+ /* blendRead */ blendRead,
};
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index f3c8ea2f7b0..98113f304da 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -854,5 +854,5 @@ ModifierTypeInfo modifierType_Array = {
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
/* blendWrite */ NULL,
- /* blendReadData */ NULL,
+ /* blendRead */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index eed7f10bcf8..1c89c4c5d05 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -273,7 +273,7 @@ static void blendWrite(BlendWriter *writer, const ModifierData *md)
}
}
-static void blendReadData(BlendDataReader *reader, ModifierData *md)
+static void blendRead(BlendDataReader *reader, ModifierData *md)
{
BevelModifierData *bmd = (BevelModifierData *)md;
BLO_read_data_address(reader, &bmd->custom_profile);
@@ -310,5 +310,5 @@ ModifierTypeInfo modifierType_Bevel = {
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
/* blendWrite */ blendWrite,
- /* blendReadData */ blendReadData,
+ /* blendRead */ blendRead,
};
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index 391f3c870bf..87addb8044f 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -376,5 +376,5 @@ ModifierTypeInfo modifierType_Boolean = {
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
/* blendWrite */ NULL,
- /* blendReadData */ NULL,
+ /* blendRead */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c
index 7d0762630f0..c59dbfdfab2 100644
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@@ -305,5 +305,5 @@ ModifierTypeInfo modifierType_Build = {
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
/* blendWrite */ NULL,
- /* blendReadData */ NULL,
+ /* blendRead */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c
index 7fd529c7609..94d80de5394 100644
--- a/source/blender/modifiers/intern/MOD_cast.c
+++ b/source/blender/modifiers/intern/MOD_cast.c
@@ -549,5 +549,5 @@ ModifierTypeInfo modifierType_Cast = {
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
/* blendWrite */ NULL,
- /* blendReadData */ NULL,
+ /* blendRead */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c
index 51121526afc..f89ca3f2b4b 100644
--- a/source/blender/modifiers/intern/MOD_cloth.c
+++ b/source/blender/modifiers/intern/MOD_cloth.c
@@ -265,7 +265,7 @@ static void blendWrite(BlendWriter *writer, const ModifierData *md)
BKE_ptcache_blend_write_list(writer, &clmd->ptcaches);
}
-static void blendReadData(BlendDataReader *reader, ModifierData *md)
+static void blendRead(BlendDataReader *reader, ModifierData *md)
{
ClothModifierData *clmd = (ClothModifierData *)md;
@@ -325,5 +325,5 @@ ModifierTypeInfo modifierType_Cloth = {
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
/* blendWrite */ blendWrite,
- /* blendReadData */ blendReadData,
+ /* blendRead */ blendRead,
};
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c
index 6cfd3c8927b..374ebcc8021 100644
--- a/source/blender/modifiers/intern/MOD_collision.c
+++ b/source/blender/modifiers/intern/MOD_collision.c
@@ -271,5 +271,5 @@ ModifierTypeInfo modifierType_Collision = {
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
/* blendWrite */ NULL,
- /* blendReadData */ NULL,
+ /* blendRead */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c
index 5a055cb02b6..f49ee676b5e 100644
--- a/source/blender/modifiers/intern/MOD_correctivesmooth.c
+++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c
@@ -126,7 +126,7 @@ static void blendWrite(BlendWriter *writer, const ModifierData *md)
}
}
-static void blendReadData(BlendDataReader *reader, ModifierData *md)
+static void blendRead(BlendDataReader *reader, ModifierData *md)
{
CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData *)md;
@@ -817,5 +817,5 @@ ModifierTypeInfo modifierType_CorrectiveSmooth = {
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
/* blendWrite */ blendWrite,
- /* blendReadData */ blendReadData,
+ /* blendRead */ blendRead,
};
diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c
index cf4ccf64a46..88a2753cc57 100644
--- a/source/blender/modifiers/intern/MOD_curve.c
+++ b/source/blender/modifiers/intern/MOD_curve.c
@@ -180,5 +180,5 @@ ModifierTypeInfo modifierType_Curve = {
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
/* blendWrite */ NULL,
- /* blendReadData */ NULL,
+ /* blendRead */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c
index 748f185fa17..bb39ac40a07 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.c
+++ b/source/blender/modifiers/intern/MOD_datatransfer.c
@@ -265,5 +265,5 @@ ModifierTypeInfo modifierType_DataTransfer = {
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
/* blendWrite */ NULL,
- /* blendReadData */ NULL,
+ /* blendRead */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index 88157421bd6..230e52f1b21 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -245,5 +245,5 @@ ModifierTypeInfo modifierType_Decimate = {
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
/* blendWrite */ NULL,
- /* blendReadData */ NULL,
+ /* blendRead */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index bba6ef4314b..357745f5141 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -444,5 +444,5 @@ ModifierTypeInfo modifierType_Displace = {
/* foreachTexLink */ foreachTexLink,
/* freeRuntimeData */ NULL,
/* blendWrite */ NULL,
- /* blendReadData */ NULL,
+ /* blendRead */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c
index 94944d6670b..1f670c70325 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@ -142,7 +142,7 @@ static void blendWrite(BlendWriter *writer, const ModifierData *md)
}
}
-static void blendReadData(BlendDataReader *reader, ModifierData *md)
+static void blendRead(BlendDataReader *reader, ModifierData *md)
{
DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
@@ -268,5 +268,5 @@ ModifierTypeInfo modifierType_DynamicPaint = {
/* foreachTexLink */ foreachTexLink,
/* freeRuntimeData */ freeRuntimeData,
/* blendWrite */ blendWrite,
- /* blendReadData */ blendReadData,
+ /* blendRead */ blendRead,
};
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modi
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list