diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-06 17:24:34 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-06 17:24:34 +0400 |
commit | acfc0ea5111bcab5ea5795187d08b2f6ec5addaa (patch) | |
tree | d9fb7e477ac551859ca95c1f0482eca8b3af1077 /source/blender/python/intern | |
parent | 72d0cc1f6123900f5593cd0fe428568f5aa7f682 (diff) | |
parent | 2ed2226ee753cc6a7a19806d99772efa61af897f (diff) |
svn merge ^/trunk/blender -r55815:55840
Diffstat (limited to 'source/blender/python/intern')
-rw-r--r-- | source/blender/python/intern/bpy_library.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/python/intern/bpy_library.c b/source/blender/python/intern/bpy_library.c index 623d45dfd90..0ab8543c4ac 100644 --- a/source/blender/python/intern/bpy_library.c +++ b/source/blender/python/intern/bpy_library.c @@ -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" |