Merging r50602 through r50617 form trunk into soc-2011-tomato

2012-09-15 06:24:48 +00:00
parent a803f5d6d0
commit beba8014e4
106 changed files with 918 additions and 728 deletions
--- a/source/blender/python/intern/bpy_interface_atexit.c
+++ b/source/blender/python/intern/bpy_interface_atexit.c
@@ -32,6 +32,7 @@
 #include <Python.h>

 #include "bpy_util.h"
+#include "bpy.h"  /* own include */

 #include "WM_api.h"