diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-11 08:35:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-11 08:35:44 +0300 |
| commit | d81d77d17c13b63a045b434f235f6a802a466955 (patch) | |
| tree | f0cf5d2499ae87b0284367feb669e271ecd639d6 /source | |
| parent | a48bc15707805d31826afa8fbd74942f8d14e9f4 (diff) | |
| parent | 89c2ff31d93582bd67a359dd0da56061ce7581cb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_text/text_format_py.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_define.c | 2 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_interface.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/space_text/text_format_py.c b/source/blender/editors/space_text/text_format_py.c index 3576d12998f..50bad9c07cf 100644 --- a/source/blender/editors/space_text/text_format_py.c +++ b/source/blender/editors/space_text/text_format_py.c @@ -62,6 +62,8 @@ static int txtfmt_py_find_builtinfunc(const char *string) 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, "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, "continue", len)) i = len; else if (STR_LITERAL_STARTSWITH(string, "del", len)) i = len; diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index 6724315f376..2a9b1aac56e 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -425,7 +425,7 @@ static int rna_validate_identifier(const char *identifier, char *error, bool pro */ static const char *kwlist[] = { /* "False", "None", "True", */ - "and", "as", "assert", "break", + "and", "as", "assert", "async", "await", "break", "class", "continue", "def", "del", "elif", "else", "except", "finally", "for", "from", "global", "if", "import", "in", "is", "lambda", "nonlocal", "not", "or", "pass", "raise", diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 8ac1d807e38..e17e7562f2a 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -1004,7 +1004,7 @@ bool BPY_string_is_keyword(const char *str) */ const char *kwlist[] = { "False", "None", "True", - "and", "as", "assert", "break", + "and", "as", "assert", "async", "await", "break", "class", "continue", "def", "del", "elif", "else", "except", "finally", "for", "from", "global", "if", "import", "in", "is", "lambda", "nonlocal", "not", "or", "pass", "raise", |