[Bf-blender-cvs] [a51fdd89fdd] master: Cleanup: use MEM_SAFE_FREE

[Campbell Barton]

Commit: a51fdd89fdd07015c0beb4cffec39f34e8a96d25
Author: Campbell Barton
Date:   Sun Mar 18 05:03:42 2018 +0100
Branches: master
https://developer.blender.org/rBa51fdd89fdd07015c0beb4cffec39f34e8a96d25

Cleanup: use MEM_SAFE_FREE

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

M	source/blender/editors/mesh/meshtools.c

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

diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index 73413bcbaad..d3d29b61182 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -552,12 +552,10 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 		if (ma)
 			id_us_min(&ma->id);
 	}
-	if (ob->mat) MEM_freeN(ob->mat);
-	if (ob->matbits) MEM_freeN(ob->matbits);
-	if (me->mat) MEM_freeN(me->mat);
-	ob->mat = me->mat = NULL;
-	ob->matbits = NULL;
-	
+	MEM_SAFE_FREE(ob->mat);
+	MEM_SAFE_FREE(ob->matbits);
+	MEM_SAFE_FREE(me->mat);
+
 	if (totcol) {
 		me->mat = matar;
 		ob->mat = MEM_callocN(sizeof(*ob->mat) * totcol, "join obmatar");