archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

svn merge ^/trunk/blender -r55815:55840

Browse Source
This commit is contained in:
Sergey Sharybin
2013-04-06 13:24:34 +00:00
parent 72d0cc1f61 2ed2226ee7
commit acfc0ea511
87 changed files with 962 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/python/intern/bpy_library.c
View File

@@ -31,20 +31,17 @@
* a context manager.
*/
/* nifty feature. swap out strings for RNA data */
#define USE_RNA_DATABLOCKS
#include <Python.h>
#include <stddef.h>
#include "BLO_readfile.h"
#include "BLI_utildefines.h"
#include "BLI_string.h"
#include "BLI_linklist.h"
#include "BLI_path_util.h"
#include "BLI_listbase.h"
#include "BLO_readfile.h"
#include "BKE_global.h"
#include "BKE_main.h"
#include "BKE_library.h"
@@ -57,6 +54,9 @@
#include "bpy_util.h"
#include "bpy_library.h"
/* nifty feature. swap out strings for RNA data */
#define USE_RNA_DATABLOCKS
#ifdef USE_RNA_DATABLOCKS
# include "bpy_rna.h"
# include "RNA_access.h"