Merged changes in the trunk up to revision 41225.

Conflicts resolved: source/blender/render/intern/source/pipeline.c
2011-10-29 15:46:14 +00:00
parent f0ca79bccb f1cea89d99
commit 16702c1729
340 changed files with 8196 additions and 7706 deletions
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -47,7 +47,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_editVert.h"
-#include "BLI_listbase.h"
 #include "BLI_utildefines.h"

 #include "BKE_animsys.h"