Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-09-23 11:18:50 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-23 11:18:50 +0400
commitc574419049f2ff7dfc558304ea9097dcf2a282c3 (patch)
tree94b11e5d742535d58f010a46fc75f2c1d512974f /source/blender/editors/include/ED_mball.h
parent7d1a36f8f4e928d8e2a3828d4def38251cdf9914 (diff)
fix for crashes caused by mixups when adding objects when incompatible object types were already in editmode.
Diffstat (limited to 'source/blender/editors/include/ED_mball.h')
-rw-r--r--source/blender/editors/include/ED_mball.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_mball.h b/source/blender/editors/include/ED_mball.h
index b4b739e4d06..5ce6db97305 100644
--- a/source/blender/editors/include/ED_mball.h
+++ b/source/blender/editors/include/ED_mball.h
@@ -38,7 +38,7 @@ struct wmKeyConfig;
void ED_operatortypes_metaball(void);
void ED_keymap_metaball(struct wmKeyConfig *keyconf);
-struct MetaElem *add_metaball_primitive(struct bContext *C, float mat[4][4], int type, int newname);
+struct MetaElem *add_metaball_primitive(struct bContext *C, struct Object *obedit, float mat[4][4], int type, int newname);
int mouse_mball(struct bContext *C, const int mval[2], int extend, int deselect, int toggle);