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

Reversing the last merge because I botched it.

Browse Source
This commit is contained in:
Mitchell Stokes
2010-05-29 21:22:24 +00:00
parent e335321e88
commit 9d3157eed0
29 changed files with 381 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/gameengine/Ketsji/KX_PythonInit.cpp
View File

@@ -628,12 +628,13 @@ static PyObject *gLibLoad(PyObject*, PyObject* args)
KX_Scene *kx_scene= gp_KetsjiScene;
char *path;
char *group;
char *filter= "";
char *err_str= NULL;
if (!PyArg_ParseTuple(args,"ss:LibLoad",&path, &group))
if (!PyArg_ParseTuple(args,"ss|s:LibLoad",&path, &group, &filter))
return NULL;
if(kx_scene->GetSceneConverter()->LinkBlendFile(path, group, kx_scene, &err_str)) {
if(kx_scene->GetSceneConverter()->LinkBlendFile(path, group, filter, kx_scene, &err_str)) {
Py_RETURN_TRUE;
}