Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-11 08:35:44 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-11 08:35:44 +0300
commitd81d77d17c13b63a045b434f235f6a802a466955 (patch)
treef0cf5d2499ae87b0284367feb669e271ecd639d6 /source/blender/makesrna/intern/rna_define.c
parenta48bc15707805d31826afa8fbd74942f8d14e9f4 (diff)
parent89c2ff31d93582bd67a359dd0da56061ce7581cb (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_define.c')
-rw-r--r--source/blender/makesrna/intern/rna_define.c2
1 files changed, 1 insertions, 1 deletions
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",