diff options
| author | Julian Eisel <julian@blender.org> | 2022-07-20 18:25:31 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-07-20 18:25:31 +0300 |
| commit | 9dbcefb10e53cc809eb2e99333376b2a881c0863 (patch) | |
| tree | 9ea058c2877c472aba82650e24e5927e3f03eded /source/blender/modifiers/intern/MOD_laplaciandeform.c | |
| parent | e1ced645fa208b3b77e07c99cb289cf7fa659ad3 (diff) | |
| parent | 85f0b2ef5d5bfb67c245da0a52aeec44e63445fa (diff) | |
Merge branch 'asset-browser-grid-view' into file-browser-grid-view
Diffstat (limited to 'source/blender/modifiers/intern/MOD_laplaciandeform.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_laplaciandeform.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.c b/source/blender/modifiers/intern/MOD_laplaciandeform.c index 06ded1c4488..e29098eb218 100644 --- a/source/blender/modifiers/intern/MOD_laplaciandeform.c +++ b/source/blender/modifiers/intern/MOD_laplaciandeform.c @@ -846,8 +846,9 @@ static void panelRegister(ARegionType *region_type) static void blendWrite(BlendWriter *writer, const ID *id_owner, const ModifierData *md) { LaplacianDeformModifierData lmd = *(const LaplacianDeformModifierData *)md; + const bool is_undo = BLO_write_is_undo(writer); - if (ID_IS_OVERRIDE_LIBRARY(id_owner)) { + if (ID_IS_OVERRIDE_LIBRARY(id_owner) && !is_undo) { BLI_assert(!ID_IS_LINKED(id_owner)); const bool is_local = (md->flag & eModifierFlag_OverrideLibrary_Local) != 0; if (!is_local) { @@ -874,7 +875,7 @@ static void blendRead(BlendDataReader *reader, ModifierData *md) } ModifierTypeInfo modifierType_LaplacianDeform = { - /* name */ "LaplacianDeform", + /* name */ N_("LaplacianDeform"), /* structName */ "LaplacianDeformModifierData", /* structSize */ sizeof(LaplacianDeformModifierData), /* srna */ &RNA_LaplacianDeformModifier, |