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.
This commit is contained in:
@@ -21,6 +21,11 @@
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
/** \file blender/python/intern/bpy.c
|
||||
* \ingroup pythonintern
|
||||
*/
|
||||
|
||||
|
||||
/* This file defines the '_bpy' module which is used by python's 'bpy' package.
|
||||
* a script writer should never directly access this module */
|
||||
@@ -43,6 +48,8 @@
|
||||
|
||||
#include "BKE_global.h" /* XXX, G.main only */
|
||||
|
||||
#include "RNA_access.h"
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
/* external util modules */
|
||||
|
Reference in New Issue
Block a user