Cycles: svn merge -r41157:41182 ^/trunk/blender

[blender-staging.git] / source / blender / python / intern / bpy_interface.c

diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 90156a9cb3e84474df132c542612f9c8af4bfdca..a937dcb1c89734c168409bb67298504767ab48d2 100644 (file)
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -172,6 +172,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},
@@ -181,6 +183,9 @@ static struct _inittab bpy_internal_modules[]= {
        {(char *)"blf", BPyInit_blf},
 #ifdef WITH_AUDASPACE
        {(char *)"aud", AUD_initPython},
+#endif
+#ifdef WITH_CYCLES
+       {(char *)"libcycles_blender", CYCLES_initPython},
 #endif
        {(char *)"gpu", GPU_initPython},
        {NULL, NULL}