svn merge ^/trunk/blender -r41100:41150

2011-10-24 04:18:28 +00:00
parent 618d4d1a6e 2bd9519e39
commit 0503a4f7a6
180 changed files with 1210 additions and 727 deletions
--- a/source/blender/modifiers/intern/MOD_boolean_util.c
+++ b/source/blender/modifiers/intern/MOD_boolean_util.c
@@ -43,6 +43,7 @@

 #include "BLI_math.h"
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
 #include "BLI_ghash.h"

 #include "BKE_cdderivedmesh.h"