From c574419049f2ff7dfc558304ea9097dcf2a282c3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 23 Sep 2012 07:18:50 +0000 Subject: fix for crashes caused by mixups when adding objects when incompatible object types were already in editmode. --- source/blender/editors/metaball/mball_edit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source/blender/editors/metaball') diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 50d5569c483..22ccd7bbed8 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -98,9 +98,8 @@ void load_editMball(Object *UNUSED(obedit)) } /* Add metaelem primitive to metaball object (which is in edit mode) */ -MetaElem *add_metaball_primitive(bContext *C, float mat[4][4], int type, int UNUSED(newname)) +MetaElem *add_metaball_primitive(bContext *UNUSED(C), Object *obedit, float mat[4][4], int type, int UNUSED(newname)) { - Object *obedit = CTX_data_edit_object(C); MetaBall *mball = (MetaBall *)obedit->data; MetaElem *ml; -- cgit v1.2.3