Merged changes in the trunk up to revision 26260.

2010-01-25 21:06:08 +00:00
parent 3c09bd41fc 4907e8df20
commit aa03d0be9a
345 changed files with 33456 additions and 21350 deletions
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -39,6 +39,7 @@
 #include "eval.h"		/* for PyEval_EvalCode */

 #include "bpy_rna.h"
+#include "bpy_props.h"
 #include "bpy_operator.h"
 #include "bpy_ui.h"
 #include "bpy_util.h"