archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T98626: Mesh Deform modifier stops working on a linked collection upon undo.

Browse Source 
Regression from rBb66368f3fd9c, we still need to store all data on undo
writes, since overrides are not re-applied after undo/redo.
This commit is contained in:
Bastien Montagne
2022-06-07 15:29:01 +02:00
parent b69aad60bd
commit ccf0d22e92
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/modifiers/intern/MOD_correctivesmooth.c
View File

@@ -801,8 +801,9 @@ static void panelRegister(ARegionType *region_type)
static void blendWrite(BlendWriter *writer, const ID *id_owner, const ModifierData *md)
{
CorrectiveSmoothModifierData csmd = *(const CorrectiveSmoothModifierData *)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) {

3
source/blender/modifiers/intern/MOD_laplaciandeform.c
View File

@@ -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) {

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

@@ -584,8 +584,9 @@ static void panelRegister(ARegionType *region_type)
static void blendWrite(BlendWriter *writer, const ID *id_owner, const ModifierData *md)
{
MeshDeformModifierData mmd = *(const MeshDeformModifierData *)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) {

3
source/blender/modifiers/intern/MOD_surfacedeform.c
View File

@@ -1672,8 +1672,9 @@ static void panelRegister(ARegionType *region_type)
static void blendWrite(BlendWriter *writer, const ID *id_owner, const ModifierData *md)
{
SurfaceDeformModifierData smd = *(const SurfaceDeformModifierData *)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) {