svn merge ^/trunk/blender -r40587:40643

2011-09-28 07:34:48 +00:00
parent dbdb58f2a3 bc593cac23
commit 4a157de23d
99 changed files with 1521 additions and 1077 deletions
--- a/source/blender/python/intern/bpy_app_handlers.c
+++ b/source/blender/python/intern/bpy_app_handlers.c
@@ -40,6 +40,8 @@ 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_post", NULL},
 	{(char *)"render_pre", NULL},
 	{(char *)"render_post", NULL},
 	{(char *)"render_stats", NULL},