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/include/ED_object.h | |
| 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/include/ED_object.h')
| -rw-r--r-- | source/blender/editors/include/ED_object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 9f42eaa0ac4..9a444c36758 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -129,7 +129,7 @@ void ED_object_constraint_update(struct Object *ob); void ED_object_constraint_dependency_update(struct Main *bmain, struct Scene *scene, struct Object *ob); /* object_lattice.c */ -int mouse_lattice(struct bContext *C, const short mval[2], int extend); +int mouse_lattice(struct bContext *C, const int mval[2], int extend); void undo_push_lattice(struct bContext *C, const char *name); /* object_lattice.c */ |