blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Merge branch 'master' into 28

This commit is contained in:
Campbell Barton 2018-03-12 16:38:41 +11:00
parent ba01cdc770 da62507bc8
commit 8f4579affd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/python_api/rst/info_api_reference.rst
View File

@ -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``

2
source/blender/editors/uvedit/uvedit_ops.c
View File

@ -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;