diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-23 11:18:50 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-23 11:18:50 +0400 |
| commit | c574419049f2ff7dfc558304ea9097dcf2a282c3 (patch) | |
| tree | 94b11e5d742535d58f010a46fc75f2c1d512974f /source/blender/editors/metaball | |
| parent | 7d1a36f8f4e928d8e2a3828d4def38251cdf9914 (diff) | |
fix for crashes caused by mixups when adding objects when incompatible object types were already in editmode.
Diffstat (limited to 'source/blender/editors/metaball')
| -rw-r--r-- | source/blender/editors/metaball/mball_edit.c | 3 |
1 files changed, 1 insertions, 2 deletions
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; |