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

Merged changes in the trunk up to revision 30167.

Browse Source
This commit is contained in:
Tamito Kajiyama
2010-07-10 00:37:42 +00:00
parent 5d725fe0e9 3eebaceaa6
commit cf2ff0b03e
91 changed files with 862 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,7 +150,6 @@ void BPY_update_modules( void )
*****************************************************************************/
static PyObject *CreateGlobalDictionary( bContext *C, const char *filename )
{
PyObject *mod;
PyObject *item;
PyObject *dict = PyDict_New( );
PyDict_SetItemString( dict, "__builtins__", PyEval_GetBuiltins( ) );
@@ -166,11 +165,6 @@ static PyObject *CreateGlobalDictionary( bContext *C, const char *filename )
Py_DECREF(item);
}
/* add bpy to global namespace */
mod= PyImport_ImportModuleLevel("bpy", NULL, NULL, NULL, 0);
PyDict_SetItemString( dict, "bpy", mod );
Py_DECREF(mod);
return dict;
}