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);
}