From 6a0ebb80885be1b86588af57f989cafd9e64305d Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Mon, 15 Jun 2020 18:37:30 +0200 Subject: Refactor: use new blenloader api for laplacian deform modifier --- source/blender/modifiers/CMakeLists.txt | 4 ++++ .../blender/modifiers/intern/MOD_laplaciandeform.c | 21 +++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) (limited to 'source/blender/modifiers') diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 78db7de2ac2..460f697a0a9 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -25,6 +25,7 @@ set(INC ../blenkernel ../blentranslation ../blenlib + ../blenloader ../bmesh ../depsgraph ../editors/include @@ -34,6 +35,9 @@ set(INC ../windowmanager ../../../intern/eigen ../../../intern/guardedalloc + + # dna_type_offsets.h in BLO_read_write.h + ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern ) set(INC_SYS diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.c b/source/blender/modifiers/intern/MOD_laplaciandeform.c index d0088fd2657..e2646e77af9 100644 --- a/source/blender/modifiers/intern/MOD_laplaciandeform.c +++ b/source/blender/modifiers/intern/MOD_laplaciandeform.c @@ -49,6 +49,8 @@ #include "UI_interface.h" #include "UI_resources.h" +#include "BLO_read_write.h" + #include "RNA_access.h" #include "MOD_ui_common.h" @@ -855,6 +857,21 @@ static void panelRegister(ARegionType *region_type) modifier_panel_register(region_type, eModifierType_LaplacianDeform, panel_draw); } +static void blendWrite(BlendWriter *writer, const ModifierData *md) +{ + LaplacianDeformModifierData *lmd = (LaplacianDeformModifierData *)md; + + BLO_write_float3_array(writer, lmd->total_verts, lmd->vertexco); +} + +static void blendRead(BlendDataReader *reader, ModifierData *md) +{ + LaplacianDeformModifierData *lmd = (LaplacianDeformModifierData *)md; + + BLO_read_float3_array(reader, lmd->total_verts, &lmd->vertexco); + lmd->cache_system = NULL; +} + ModifierTypeInfo modifierType_LaplacianDeform = { /* name */ "LaplacianDeform", /* structName */ "LaplacianDeformModifierData", @@ -884,6 +901,6 @@ ModifierTypeInfo modifierType_LaplacianDeform = { /* foreachTexLink */ NULL, /* freeRuntimeData */ NULL, /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /* blendWrite */ blendWrite, + /* blendRead */ blendRead, }; -- cgit v1.2.3