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

Merged changes in the trunk up to revision 33112.

Browse Source
This commit is contained in:
Tamito Kajiyama
2010-11-17 00:58:03 +00:00
parent a95181a7a0 12afa64de9
commit 09ba291c55
273 changed files with 4166 additions and 3669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,7 @@ static PyObject *bpy_blend_paths(PyObject *UNUSED(self), PyObject *args, PyObjec
PyObject *list = PyList_New(0), *st; /* stupidly big string to be safe */
/* be sure there is low chance of the path being too short */
char filepath_expanded[1024];
char *lib;
const char *lib;
int absolute = 0;
static char *kwlist[] = {"absolute", NULL};

14
source/blender/python/intern/bpy_operator.c
View File

@@ -73,8 +73,13 @@ static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args)
}
}
if(!PyDict_Check(context_dict))
if(context_dict==NULL || context_dict==Py_None) {
context_dict= NULL;
}
else if (!PyDict_Check(context_dict)) {
PyErr_Format(PyExc_TypeError, "Calling operator \"bpy.ops.%s.poll\" error, custom context expected a dict or None, got a %.200s", opname, Py_TYPE(context_dict)->tp_name);
return NULL;
}
context_dict_back= CTX_py_dict_get(C);
@@ -130,8 +135,13 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
}
}
if(!PyDict_Check(context_dict))
if(context_dict==NULL || context_dict==Py_None) {
context_dict= NULL;
}
else if (!PyDict_Check(context_dict)) {
PyErr_Format(PyExc_TypeError, "Calling operator \"bpy.ops.%s\" error, custom context expected a dict or None, got a %.200s", opname, Py_TYPE(context_dict)->tp_name);
return NULL;
}
context_dict_back= CTX_py_dict_get(C);