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

svn merge ^/trunk/blender -r55357:55372

Browse Source
This commit is contained in:
Campbell Barton
2013-03-18 21:45:29 +00:00
parent c1ceab1281 7bfef29f2f
commit 29b7b344fc
102 changed files with 400 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/intern/bpy.c
View File

@@ -226,7 +226,7 @@ static PyMethodDef meth_bpy_resource_path =
static PyObject *bpy_import_test(const char *modname)
{
PyObject *mod = PyImport_ImportModuleLevel((char *)modname, NULL, NULL, NULL, 0);
PyObject *mod = PyImport_ImportModuleLevel(modname, NULL, NULL, NULL, 0);
if (mod) {
Py_DECREF(mod);
}

4
source/blender/python/intern/bpy_driver.c
View File

@@ -75,14 +75,14 @@ int bpy_pydriver_create_dict(void)
}
/* add bpy to global namespace */
mod = PyImport_ImportModuleLevel((char *)"bpy", NULL, NULL, NULL, 0);
mod = PyImport_ImportModuleLevel("bpy", NULL, NULL, NULL, 0);
if (mod) {
PyDict_SetItemString(bpy_pydriver_Dict, "bpy", mod);
Py_DECREF(mod);
}
/* add noise to global namespace */
mod = PyImport_ImportModuleLevel((char *)"mathutils", NULL, NULL, NULL, 0);
mod = PyImport_ImportModuleLevel("mathutils", NULL, NULL, NULL, 0);
if (mod) {
PyObject *modsub = PyDict_GetItemString(PyModule_GetDict(mod), "noise");
PyDict_SetItemString(bpy_pydriver_Dict, "noise", modsub);

2
source/blender/python/intern/bpy_interface_atexit.c
View File

@@ -57,7 +57,7 @@ static void atexit_func_call(const char *func_name, PyObject *atexit_func_arg)
* this is intended, but if its problematic it could be changed
* - campbell */
PyObject *atexit_mod = PyImport_ImportModuleLevel((char *)"atexit", NULL, NULL, NULL, 0);
PyObject *atexit_mod = PyImport_ImportModuleLevel("atexit", NULL, NULL, NULL, 0);
PyObject *atexit_func = PyObject_GetAttrString(atexit_mod, func_name);
PyObject *args = PyTuple_New(1);
PyObject *ret;

2
source/blender/python/intern/bpy_rna.c
View File

@@ -6118,7 +6118,7 @@ static PyObject *pyrna_srna_ExternalType(StructRNA *srna)
PyObject *newclass;
if (bpy_types_dict == NULL) {
PyObject *bpy_types = PyImport_ImportModuleLevel((char *)"bpy_types", NULL, NULL, NULL, 0);
PyObject *bpy_types = PyImport_ImportModuleLevel("bpy_types", NULL, NULL, NULL, 0);
if (bpy_types == NULL) {
PyErr_Print();