archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix [#26667] Can't import scripts when using blenderplayer

Browse Source 
- move import override initialization to bpy_internal_import.c so the player and blender can both call.
- remove ineffectual & unused sandboxing code.
This commit is contained in:
Campbell Barton
2011-03-29 16:12:25 +00:00
parent c0ab420a73
commit f4ba9495c5
4 changed files with 26 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/python/intern/bpy_interface.c
View File

@@ -272,27 +272,7 @@ void BPY_python_start(int argc, const char **argv)
/* bpy.* and lets us import it */
BPy_init_modules();
{ /* our own import and reload functions */
PyObject *item;
PyObject *mod;
//PyObject *m= PyImport_AddModule("__builtin__");
//PyObject *d= PyModule_GetDict(m);
PyObject *d= PyEval_GetBuiltins();
// PyDict_SetItemString(d, "reload", item=PyCFunction_New(&bpy_reload_meth, NULL)); Py_DECREF(item);
PyDict_SetItemString(d, "__import__", item=PyCFunction_New(&bpy_import_meth, NULL)); Py_DECREF(item);
/* move reload here
* XXX, use import hooks */
mod= PyImport_ImportModuleLevel((char *)"imp", NULL, NULL, NULL, 0);
if(mod) {
PyDict_SetItemString(PyModule_GetDict(mod), "reload", item=PyCFunction_New(&bpy_reload_meth, NULL)); Py_DECREF(item);
Py_DECREF(mod);
}
else {
BLI_assert(!"unable to load 'imp' module.");
}
}
bpy_import_init(PyEval_GetBuiltins());
pyrna_alloc_types();