NLA SoC: Merge from 2.5

21301 to 21329
This commit is contained in:
Joshua Leung
2009-07-03 01:57:38 +00:00
62 changed files with 1827 additions and 727 deletions

View File

@@ -37,7 +37,7 @@
#include "BPY_extern.h"
#include "../generic/bpy_internal_import.h" // our own imports
/* external util modukes */
/* external util modules */
#include "../generic/Mathutils.h"
#include "../generic/Geometry.h"
@@ -132,6 +132,21 @@ static PyObject *CreateGlobalDictionary( bContext *C )
return dict;
}
/* Use this so we can include our own python bundle */
#if 0
wchar_t* Py_GetPath(void)
{
int i;
static wchar_t py_path[FILE_MAXDIR] = L"";
char *dirname= BLI_gethome_folder("python");
if(dirname) {
i= mbstowcs(py_path, dirname, FILE_MAXDIR);
printf("py path %s, %d\n", dirname, i);
}
return py_path;
}
#endif
void BPY_start_python( int argc, char **argv )
{
PyThreadState *py_tstate = NULL;