blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

LibOverride: Do not write MeshDeform modifier binding data. 

Skip writing binding data and similar for override modifiers already
present in reference linked data, as this can use a lot of space, and
is fully useless data typically since we already skip writing Mesh
geometry data itself.

Ref. T97967.
This commit is contained in:
Bastien Montagne 2022-05-16 16:50:21 +02:00
parent 68d203af0b
commit b66368f3fd
Notes: blender-bot 2023-02-14 06:42:53 +01:00 
Referenced by issue #98626, Regression: Mesh Deform modifier stops working on a linked collection upon undo
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/blender/modifiers/intern/MOD_meshdeform.c
View File

@ -581,28 +581,49 @@ static void panelRegister(ARegionType *region_type)
modifier_panel_register(region_type, eModifierType_MeshDeform, panel_draw);
}
static void blendWrite(BlendWriter *writer, const ID *UNUSED(id_owner), const ModifierData *md)
static void blendWrite(BlendWriter *writer, const ID *id_owner, const ModifierData *md)
{
MeshDeformModifierData *mmd = (MeshDeformModifierData *)md;
int size = mmd->dyngridsize;
MeshDeformModifierData mmd = *(const MeshDeformModifierData *)md;
BLO_write_struct(writer, MeshDeformModifierData, mmd);
if (ID_IS_OVERRIDE_LIBRARY(id_owner)) {
BLI_assert(!ID_IS_LINKED(id_owner));
const bool is_local = (md->flag & eModifierFlag_OverrideLibrary_Local) != 0;
if (!is_local) {
/* Modifier comming from linked data cannot be bound from an override, so we can remove all
* binding data, can save a sgnificant amout of memory. */
mmd.influences_num = 0;
mmd.bindinfluences = NULL;
mmd.verts_num = 0;
mmd.bindoffsets = NULL;
mmd.cage_verts_num = 0;
mmd.bindcagecos = NULL;
mmd.dyngridsize = 0;
mmd.dyngrid = NULL;
mmd.influences_num = 0;
mmd.dyninfluences = NULL;
mmd.dynverts = NULL;
}
}
BLO_write_struct_array(writer, MDefInfluence, mmd->influences_num, mmd->bindinfluences);
const int size = mmd.dyngridsize;
BLO_write_struct_at_address(writer, MeshDeformModifierData, md, &mmd);
BLO_write_struct_array(writer, MDefInfluence, mmd.influences_num, mmd.bindinfluences);
/* NOTE: `bindoffset` is abusing `verts_num + 1` as its size, this becomes an incorrect value in
* case `verts_num == 0`, since `bindoffset` is then NULL, not a size 1 allocated array. */
if (mmd->verts_num > 0) {
BLO_write_int32_array(writer, mmd->verts_num + 1, mmd->bindoffsets);
if (mmd.verts_num > 0) {
BLO_write_int32_array(writer, mmd.verts_num + 1, mmd.bindoffsets);
}
else {
BLI_assert(mmd->bindoffsets == NULL);
BLI_assert(mmd.bindoffsets == NULL);
}
BLO_write_float3_array(writer, mmd->cage_verts_num, mmd->bindcagecos);
BLO_write_struct_array(writer, MDefCell, size * size * size, mmd->dyngrid);
BLO_write_struct_array(writer, MDefInfluence, mmd->influences_num, mmd->dyninfluences);
BLO_write_int32_array(writer, mmd->verts_num, mmd->dynverts);
BLO_write_float3_array(writer, mmd.cage_verts_num, mmd.bindcagecos);
BLO_write_struct_array(writer, MDefCell, size * size * size, mmd.dyngrid);
BLO_write_struct_array(writer, MDefInfluence, mmd.influences_num, mmd.dyninfluences);
BLO_write_int32_array(writer, mmd.verts_num, mmd.dynverts);
}
static void blendRead(BlendDataReader *reader, ModifierData *md)