Merge branch 'master' into blender2.8

2017-06-12 15:09:33 +02:00
parent f52dc2f371 d8957e4cce
commit 0f4f4d8754
114 changed files with 1532 additions and 480 deletions
--- a/source/blender/python/intern/bpy_app_sdl.c
+++ b/source/blender/python/intern/bpy_app_sdl.c
@@ -56,7 +56,7 @@ static PyStructSequence_Field app_sdl_info_fields[] = {
 	{(char *)"available", (char *)("Boolean, True when SDL is available. This is False when "
 	                               "either *supported* is False, or *dynload* is True and "
 	                               "Blender cannot find the correct library.")},
-    {NULL}
+	{NULL}
 };

 static PyStructSequence_Desc app_sdl_info_desc = {