Merged changes in the trunk up to revision 39759.

2011-08-28 23:25:13 +00:00
parent 7eb10d1538 c31b776dc9
commit 1c153b011d
149 changed files with 5009 additions and 1021 deletions
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -38,6 +38,7 @@
 #include "RNA_define.h"
 #include "RNA_access.h"
 #include "RNA_enum_types.h"
+#include "rna_internal.h"

 #include "BKE_utildefines.h"