Merge branch 'master' into blender2.8

2018-05-08 14:22:46 +02:00
parent cc8672b95e 49fe27ee46
commit b857b8f4c4
10 changed files with 22 additions and 32 deletions
--- a/source/blender/modifiers/intern/MOD_explode.c
+++ b/source/blender/modifiers/intern/MOD_explode.c
@@ -66,7 +66,7 @@ static void freeData(ModifierData *md)
 {
 	ExplodeModifierData *emd = (ExplodeModifierData *) md;
 	
-	if (emd->facepa) MEM_freeN(emd->facepa);
+	MEM_SAFE_FREE(emd->facepa);
 }
 static void copyData(ModifierData *md, ModifierData *target)
 {