* add some (disabled) test code for using OpenImageIO in imbuf
* link cycles, openimageio and boost into blender instead of a shared library
* some cmakefile changes to simplify the code and follow conventions better
* this may solve running cycles problems on windows XP, or give a different
  and hopefully more useful error message
This commit is contained in:
2011-08-16 16:15:34 +00:00
parent 18387f3e3f
commit 360fcd73fe
31 changed files with 808 additions and 504 deletions

View File

@@ -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
{NULL, NULL}
};