svn merge ^/trunk/blender -r40720:40872

2011-10-09 07:31:15 +00:00
parent 9d0186fc6a 8714fb7019
commit aa6d7ebd14
212 changed files with 2400 additions and 1921 deletions
--- a/source/blender/python/intern/bpy_app_handlers.c
+++ b/source/blender/python/intern/bpy_app_handlers.c
@@ -40,7 +40,7 @@ void bpy_app_generic_callback(struct Main *main, struct ID *id, void *arg);
 static PyTypeObject BlenderAppCbType;

 static PyStructSequence_Field app_cb_info_fields[]= {
-    {(char *)"frame_change_pre", NULL},
+	{(char *)"frame_change_pre", NULL},
 	{(char *)"frame_change_post", NULL},
 	{(char *)"render_pre", NULL},
 	{(char *)"render_post", NULL},