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

* Fixes segfault caused in the Object.getParent function.

Browse Source 
Found by Jonathan Thambidurai
* Fixes a scriptlink problem when a script is run using ALT-p.
  Found by Yann Vernier (LoneTech)
* Prints unhandled exceptions. Should fix some memory leaks too.
  Fixed by Yann Verniet (LoneTech)
This commit is contained in:
Michel Selten
2003-06-22 18:34:36 +00:00
parent 85f5804333
commit d253eb4b75
4 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/python/BPY_interface.c
View File

@@ -240,6 +240,8 @@ struct _object *BPY_txt_do_python(struct SpaceText* st)
else
dict = PyModule_GetDict(PyImport_AddModule("__main__"));
clearScriptLinks ();
ret = RunPython (st->text, dict); /* Run the script */
if (!ret) { /* Failed execution of the script */
@@ -353,6 +355,7 @@ void BPY_do_pyscript(struct ID *id, short event)
ScriptLink * scriptlink;
int index;
PyObject * dict;
PyObject * ret;
printf ("In BPY_do_pyscript(id=%s, event=%d)\n",id->name, event);
@@ -368,8 +371,19 @@ void BPY_do_pyscript(struct ID *id, short event)
(scriptlink->scripts[index] != NULL))
{
dict = CreateGlobalDictionary();
RunPython ((Text*) scriptlink->scripts[index], dict);
ret = RunPython ((Text*) scriptlink->scripts[index], dict);
ReleaseGlobalDictionary (dict);
if (!ret)
{
/* Failed execution of the script */
BPY_Err_Handle ((Text*) scriptlink->scripts[index]);
BPY_end_python ();
BPY_start_python ();
}
else
{
Py_DECREF (ret);
}
}
}