svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after

2011-10-24 07:56:42 +00:00
parent 77a7ec7c61 1bdf652b89
commit ad1d3dd30f
116 changed files with 5710 additions and 5693 deletions
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -67,6 +67,7 @@
 #include "BLI_cellalloc.h"
 #include "BLI_winstuff.h"

+#include "RE_engine.h"
 #include "RE_pipeline.h"		/* RE_ free stuff */

 #ifdef WITH_PYTHON