svn merge -r41899:41926 ^/trunk/blender. also sync mempool with trunk and move BLI_mempool_alloc out of mempools header where it was inlined

2011-11-16 19:06:38 +00:00
parent 707fcc42a3 1af839081b
commit 9d05ccf9e8
42 changed files with 357 additions and 358 deletions
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -33,6 +33,7 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_utildefines.h"
+#include "BLI_string.h"
 #include "BLI_math.h"
 #include "BLI_ghash.h"
 #include "BLI_edgehash.h"