diff options
Diffstat (limited to 'source/blender/python')
| -rw-r--r-- | source/blender/python/SConscript | 5 | ||||
| -rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_interface.c | 5 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_rna.c | 2 |
4 files changed, 15 insertions, 2 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 3f47038687a..7075b0592b8 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -4,7 +4,7 @@ Import ('env') -incs = '. ../editors/include ../makesdna ../makesrna ../blenlib ../blenkernel ../nodes' +incs = '. ../editors/include ../makesdna ../makesrna ../blenfont ../blenlib ../blenkernel ../nodes' incs += ' ../imbuf ../blenloader ../gpu ../render/extern/include ../windowmanager' incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include' incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC'] @@ -43,5 +43,8 @@ if env['BF_BUILDINFO']: if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') +if env['WITH_BF_CYCLES']: + defs.append('WITH_CYCLES') + sources = env.Glob('intern/*.c') env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361]) diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index 0d5b980acba..63ccdea3f0d 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -25,6 +25,7 @@ set(INC .. + ../../blenfont ../../blenkernel ../../blenlib ../../blenloader @@ -95,6 +96,10 @@ if(WITH_AUDASPACE) add_definitions(-DWITH_AUDASPACE) endif() +if(WITH_CYCLES) + add_definitions(-DWITH_CYCLES) +endif() + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index ffa9e5cc27c..7dee2ce6fb4 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -174,6 +174,8 @@ void BPY_context_set(bContext *C) /* defined in AUD_C-API.cpp */ extern PyObject *AUD_initPython(void); +/* defined in cycles/blender */ +extern PyObject *CYCLES_initPython(void); static struct _inittab bpy_internal_modules[]= { {(char *)"noise", BPyInit_noise}, @@ -184,6 +186,9 @@ static struct _inittab bpy_internal_modules[]= { #ifdef WITH_AUDASPACE {(char *)"aud", AUD_initPython}, #endif +#ifdef WITH_CYCLES + {(char *)"bcycles", CYCLES_initPython}, +#endif {(char *)"gpu", GPU_initPython}, {NULL, NULL} }; diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 44e26a56db6..15a9ba44552 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -77,7 +77,7 @@ #include "../generic/py_capi_utils.h" #ifdef WITH_INTERNATIONAL -#include "UI_interface.h" /* bad level call into editors */ +#include "BLF_translation.h" #endif #define USE_PEDANTIC_WRITE |