merge from trunk at r31523

2010-09-07 05:47:34 +00:00
parent 859c5a42f0 8a320974f1
commit 82432d0d99
342 changed files with 6150 additions and 4824 deletions
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -41,6 +41,7 @@
 #include "MEM_guardedalloc.h"
 #include "BLI_path_util.h"
 #include "BLI_math_base.h"
+#include "BLI_string.h"

 #include "BKE_context.h"
 #include "BKE_text.h"