diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-13 08:04:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-13 08:04:53 +0400 |
| commit | 6cc8f734c0f17554e2aea4c2ea88e097e3a4199c (patch) | |
| tree | d9b7fab2d64a02b59a674c35116cf502904ff7c0 /source/blender/editors/metaball | |
| parent | e636893b1b362840dca779c33b6dca87be5dd0bd (diff) | |
| parent | b73fe01295636aea92bf3076874b5e3cbcba9057 (diff) | |
svn merge -r36603:36651 https://svn.blender.org/svnroot/bf-blender/trunk/blender \nwith some manual edits
Diffstat (limited to 'source/blender/editors/metaball')
| -rw-r--r-- | source/blender/editors/metaball/mball_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 7eb75dce79b..4ffa2b76704 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -455,7 +455,7 @@ void MBALL_OT_reveal_metaelems(wmOperatorType *ot) /* Select MetaElement with mouse click (user can select radius circle or * stiffness circle) */ -int mouse_mball(bContext *C, const short mval[2], int extend) +int mouse_mball(bContext *C, const int mval[2], int extend) { static MetaElem *startelem=NULL; Object *obedit= CTX_data_edit_object(C); |