Merge branch 'master' into blender2.8

This commit is contained in:
2018-11-11 16:35:44 +11:00
3 changed files with 4 additions and 2 deletions

View File

@@ -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",