[Bf-blender-cvs] [a40073f] master: Fix use after free error from ab993e37

[Campbell Barton]

Commit: a40073ffccc49689e212c010996fc231dc8e46af
Author: Campbell Barton
Date:   Sun Jul 17 03:03:22 2016 +1000
Branches: master
https://developer.blender.org/rBa40073ffccc49689e212c010996fc231dc8e46af

Fix use after free error from ab993e37

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

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

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

diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index ea9fa57..b2f5732 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -2224,7 +2224,6 @@ Mesh *BKE_mesh_new_from_object(
 {
 	Mesh *tmpmesh;
 	Curve *tmpcu = NULL, *copycu;
-	Object *tmpobj = NULL;
 	int render = settings == eModifierMode_Render, i;
 	int cage = !apply_modifiers;
 
@@ -2239,7 +2238,7 @@ Mesh *BKE_mesh_new_from_object(
 			int uv_from_orco;
 
 			/* copies object and modifiers (but not the data) */
-			tmpobj = BKE_object_copy_ex(bmain, ob, true);
+			Object *tmpobj = BKE_object_copy_ex(bmain, ob, true);
 			tmpcu = (Curve *)tmpobj->data;
 			id_us_min(&tmpcu->id);
 
@@ -2440,7 +2439,7 @@ Mesh *BKE_mesh_new_from_object(
 	}
 
 	/* make sure materials get updated in object */
-	test_object_materials(tmpobj ? tmpobj : ob, &tmpmesh->id);
+	test_object_materials(ob, &tmpmesh->id);
 
 	return tmpmesh;
 }