Merged changes in the trunk up to revision 35367.

To branch builders: From this revision Python 3.2 will be used. Don't forget svn update in the "lib" directory as well.
2011-03-06 12:13:32 +00:00
parent 29fafab107 a2b128aa35
commit 33efa9eeb6
1026 changed files with 15856 additions and 10181 deletions
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -35,6 +35,7 @@ extern "C" {
 //------------------------ MODULE FUNCTIONS ----------------------------------

 #include "FRS_freestyle.h"
+#include "RNA_access.h"
 #include "bpy_rna.h" /* pyrna_struct_CreatePyObject() */

 static char Freestyle_getCurrentScene___doc__[] =