archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-11-11 16:35:44 +11:00
parent a48bc15707 89c2ff31d9
commit d81d77d17c
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_text/text_format_py.c
View File

@@ -62,6 +62,8 @@ static int txtfmt_py_find_builtinfunc(const char *string)
if (STR_LITERAL_STARTSWITH(string, "and", len)) i = len; if (STR_LITERAL_STARTSWITH(string, "and", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "as", len)) i = len; else if (STR_LITERAL_STARTSWITH(string, "as", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "assert", len)) i = len; else if (STR_LITERAL_STARTSWITH(string, "assert", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "async", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "await", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "break", len)) i = len; else if (STR_LITERAL_STARTSWITH(string, "break", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "continue", len)) i = len; else if (STR_LITERAL_STARTSWITH(string, "continue", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "del", len)) i = len; else if (STR_LITERAL_STARTSWITH(string, "del", len)) i = len;

2
source/blender/makesrna/intern/rna_define.c
View File

@@ -425,7 +425,7 @@ static int rna_validate_identifier(const char *identifier, char *error, bool pro
*/ */
static const char *kwlist[] = { static const char *kwlist[] = {
/* "False", "None", "True", */ /* "False", "None", "True", */
"and", "as", "assert", "break", "and", "as", "assert", "async", "await", "break",
"class", "continue", "def", "del", "elif", "else", "except", "class", "continue", "def", "del", "elif", "else", "except",
"finally", "for", "from", "global", "if", "import", "in", "finally", "for", "from", "global", "if", "import", "in",
"is", "lambda", "nonlocal", "not", "or", "pass", "raise", "is", "lambda", "nonlocal", "not", "or", "pass", "raise",

2
source/blender/python/intern/bpy_interface.c
View File

@@ -1004,7 +1004,7 @@ bool BPY_string_is_keyword(const char *str)
*/ */
const char *kwlist[] = { const char *kwlist[] = {
"False", "None", "True", "False", "None", "True",
"and", "as", "assert", "break", "and", "as", "assert", "async", "await", "break",
"class", "continue", "def", "del", "elif", "else", "except", "class", "continue", "def", "del", "elif", "else", "except",
"finally", "for", "from", "global", "if", "import", "in", "finally", "for", "from", "global", "if", "import", "in",
"is", "lambda", "nonlocal", "not", "or", "pass", "raise", "is", "lambda", "nonlocal", "not", "or", "pass", "raise",