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

Merged changes in the trunk up to revision 50257.

Browse Source 
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
This commit is contained in:
Tamito Kajiyama
2012-08-29 00:53:29 +00:00
parent 22b30da565 8321acaf43
commit 141dd5233e
472 changed files with 9322 additions and 4789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,12 +117,12 @@ static PyObject *bpy_blend_paths(PyObject *UNUSED(self), PyObject *args, PyObjec
PyObject *list;
int absolute = FALSE;
int packed = FALSE;
int local = FALSE;
int packed = FALSE;
int local = FALSE;
static const char *kwlist[] = {"absolute", "packed", "local", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kw, "|ii:blend_paths",
(char **)kwlist, &absolute, &packed))
if (!PyArg_ParseTupleAndKeywords(args, kw, "|iii:blend_paths",
(char **)kwlist, &absolute, &packed, &local))
{
return NULL;
}