diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-12 08:38:41 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-12 08:38:41 +0300 |
commit | 8f4579affd3809aa7e21a8985b2c45ee2a655695 (patch) | |
tree | c4c8262838057289a880d7027eb8ed67b0bbd8aa | |
parent | ba01cdc77076f12e421ca8ffa60218b19f313662 (diff) | |
parent | da62507bc8f00f6cd443b450d973114c762b16fc (diff) |
Merge branch 'master' into 28
-rw-r--r-- | doc/python_api/rst/info_api_reference.rst | 2 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/python_api/rst/info_api_reference.rst b/doc/python_api/rst/info_api_reference.rst index 5ef5866c44a..ab690a8ee06 100644 --- a/doc/python_api/rst/info_api_reference.rst +++ b/doc/python_api/rst/info_api_reference.rst @@ -53,7 +53,7 @@ Here are some characteristics ID Data-Blocks share. Simple Data Access ------------------ -Lets start with a simple case, say you wan't a python script to adjust the objects location. +Lets start with a simple case, say you want a python script to adjust the objects location. Start by finding this setting in the interface ``Properties Window -> Object -> Transform -> Location`` diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 1c54ea0ebc1..5b1320df51d 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -1981,7 +1981,7 @@ static void UV_OT_select_all(wmOperatorType *ot) /* ******************** mouse select operator **************** */ -static bool uv_sticky_select(float *limit, int hitv[4], int v, float *hituv[4], float *uv, int sticky, int hitlen) +static bool uv_sticky_select(float *limit, int hitv[], int v, float *hituv[], float *uv, int sticky, int hitlen) { int i; |