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

Fix T60304, T60301: setting error message in bevel modifier results in double free

Browse Source
This commit is contained in:
Jacques Lucke
2019-01-14 14:10:33 +01:00
parent 67c5412708
commit ec3e2b0ce5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/modifiers/intern/MOD_bevel.c
View File

@@ -74,12 +74,13 @@ static void initData(ModifierData *md)
bmd->clnordata.faceHash = NULL;
}
static void copyData(const ModifierData *md_src, ModifierData *md_dst, const int UNUSED(flag))
static void copyData(const ModifierData *md_src, ModifierData *md_dst, const int flag)
{
BevelModifierData *bmd_src = (BevelModifierData *)md_src;
BevelModifierData *bmd_dst = (BevelModifierData *)md_dst;
*bmd_dst = *bmd_src;
modifier_copyData_generic(md_src, md_dst, flag);
bmd_dst->clnordata.faceHash = NULL;
}
@@ -99,6 +100,8 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
*/
static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh)
{
// modifier_setError(md, "Hello world");
// return BKE_mesh_new_nomain(0, 0, 0, 0, 0);
Mesh *result;
BMesh *bm;
BMIter iter;