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

* Fixed crash in Object.getTracked() method

Browse Source 
It tried to create a new Object from the tracked variable, when the variable
  was NULL. Ouch.
This commit is contained in:
Michel Selten
2003-07-30 18:47:05 +00:00
parent cef267684e
commit 8a558f2e45
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/python/api2_2x/Object.c
View File

@@ -764,15 +764,11 @@ static PyObject *Object_getParent (BPy_Object *self)
PyObject *attr;
if (self->parent)
{
Py_INCREF ((PyObject*)self->parent);
return ((PyObject*)self->parent);
}
return EXPP_incr_ret ((PyObject*) self->parent);
if (self->object->parent == NULL)
{
return (EXPP_incr_ret (Py_None));
}
return EXPP_incr_ret (Py_None);
attr = Object_CreatePyObject (self->object->parent);
if (attr)
@@ -790,12 +786,11 @@ static PyObject *Object_getTracked (BPy_Object *self)
PyObject *attr;
if (self->track)
{
Py_INCREF ((PyObject*)self->track);
return ((PyObject*)self->track);
}
return EXPP_incr_ret ((PyObject*)self->track);
/* TODO: what if self->object->track==NULL? Should we return Py_None? */
if (self->object->track == NULL)
return EXPP_incr_ret (Py_None);
attr = Object_CreatePyObject (self->object->track);
if (attr)