From c35f1d05eaa13348d4f33cdb44f6fb62f68e1ba3 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Thu, 9 Nov 2017 13:11:20 -0200 Subject: Farewell Scene->basact --- source/blender/editors/mesh/meshtools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/mesh') diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index da0da05bb13..dd1fbc36d8a 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -526,7 +526,7 @@ int join_mesh_exec(bContext *C, wmOperator *op) /* free base, now that data is merged */ if (base->object != ob) { - ED_base_object_free_and_unlink(bmain, scene, base->object); + ED_object_base_free_and_unlink(bmain, scene, base->object); } } } -- cgit v1.2.3