[Bf-blender-cvs] [db45a165f91] temp-modifier-rm-cddm: Removed potential free of NULL

[Sybren A. Stüvel]

Commit: db45a165f91e21fc8b20a0b59d1e68a042f17460
Author: Sybren A. Stüvel
Date:   Wed Apr 25 10:14:46 2018 +0200
Branches: temp-modifier-rm-cddm
https://developer.blender.org/rBdb45a165f91e21fc8b20a0b59d1e68a042f17460

Removed potential free of NULL

===================================================================

M       source/blender/blenkernel/intern/mesh.c

===================================================================

diff --git a/source/blender/blenkernel/intern/mesh.c 
b/source/blender/blenkernel/intern/mesh.c
index 1eb9dc0d408..efc97ef48c7 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -404,12 +404,16 @@ bool BKE_mesh_clear_edit_data(struct Mesh *me)
                return false;
        }
 
-       MEM_freeN((void *)me->emd->polyCos);
-       MEM_freeN((void *)me->emd->polyNos);
-       MEM_freeN((void *)me->emd->vertexCos);
-       MEM_freeN((void *)me->emd->vertexNos);
+       if (me->emd->polyCos != NULL)
+               MEM_freeN((void *)me->emd->polyCos);
+       if (me->emd->polyNos != NULL)
+               MEM_freeN((void *)me->emd->polyNos);
+       if (me->emd->vertexCos != NULL)
+               MEM_freeN((void *)me->emd->vertexCos);
+       if (me->emd->vertexNos != NULL)
+               MEM_freeN((void *)me->emd->vertexNos);
+
        MEM_SAFE_FREE(me->emd);
-       BLI_assert(me->emd == NULL);
        return true;
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs