blender/blender
159
504
Fork 761
Code Issues 6.8k Pull Requests 912 Projects 18 Wiki Activity

Fix #107670: Lattice undo misses vertex group weights data #107776

Merged
Philipp Oeser merged 1 commits from lichtwerk/blender:107670 into main 2023-05-10 09:23:47 +02:00
Conversation 0 Commits 1 Files Changed 1 +22
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/lattice/editlattice_undo.c
View File

@ -18,10 +18,12 @@
#include "DNA_curve_types.h" #include "DNA_curve_types.h"
#include "DNA_lattice_types.h" #include "DNA_lattice_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "BKE_context.h" #include "BKE_context.h"
#include "BKE_deform.h"
#include "BKE_layer.h" #include "BKE_layer.h"
#include "BKE_main.h" #include "BKE_main.h"
#include "BKE_object.h" #include "BKE_object.h"
@ -53,6 +55,7 @@ typedef struct UndoLattice {
char typeu, typev, typew; char typeu, typev, typew;
float fu, fv, fw; float fu, fv, fw;
float du, dv, dw; float du, dv, dw;
MDeformVert *dvert;
size_t undo_size; size_t undo_size;
} UndoLattice; } UndoLattice;
@ -68,6 +71,14 @@ static void undolatt_to_editlatt(UndoLattice *ult, EditLatt *editlatt)
memcpy(editlatt->latt->def, ult->def, sizeof(BPoint) * len_src); memcpy(editlatt->latt->def, ult->def, sizeof(BPoint) * len_src);
} }
/* Even for the same amount of points we dont just copy memory for MDeformVert, relations to
* MDeformWeight might have changed. */
if (editlatt->latt->dvert && ult->dvert) {
BKE_defvert_array_free(editlatt->latt->dvert, len_dst);
editlatt->latt->dvert = MEM_mallocN(sizeof(MDeformVert) * len_src, "Lattice MDeformVert");
BKE_defvert_array_copy(editlatt->latt->dvert, ult->dvert, len_src);
}
editlatt->latt->pntsu = ult->pntsu; editlatt->latt->pntsu = ult->pntsu;
editlatt->latt->pntsv = ult->pntsv; editlatt->latt->pntsv = ult->pntsv;
editlatt->latt->pntsw = ult->pntsw; editlatt->latt->pntsw = ult->pntsw;
@ -106,6 +117,13 @@ static void *undolatt_from_editlatt(UndoLattice *ult, EditLatt *editlatt)
ult->dv = editlatt->latt->dv; ult->dv = editlatt->latt->dv;
ult->dw = editlatt->latt->dw; ult->dw = editlatt->latt->dw;
if (editlatt->latt->dvert) {
const int tot = ult->pntsu * ult->pntsv * ult->pntsw;
ult->dvert = MEM_mallocN(sizeof(MDeformVert) * tot, "Undo Lattice MDeformVert");
BKE_defvert_array_copy(ult->dvert, editlatt->latt->dvert, tot);
ult->undo_size += sizeof(*ult->dvert) * tot;
}
ult->undo_size += sizeof(*ult->def) * ult->pntsu * ult->pntsv * ult->pntsw; ult->undo_size += sizeof(*ult->def) * ult->pntsu * ult->pntsv * ult->pntsw;
return ult; return ult;
@ -116,6 +134,10 @@ static void undolatt_free_data(UndoLattice *ult)
if (ult->def) { if (ult->def) {
MEM_freeN(ult->def); MEM_freeN(ult->def);
} }
if (ult->dvert) {
BKE_defvert_array_free(ult->dvert, ult->pntsu * ult->pntsv * ult->pntsw);
ult->dvert = NULL;
}
} }
#if 0 #if 0