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

Mistake in recent schange to scn.objects.new() crashed Blender. fixed and also stopped Mesh_FromPyObject() clearning a meshes object if not called with an object.

Browse Source
This commit is contained in:
Campbell Barton
2006-10-10 02:18:08 +00:00
parent 475bc908be
commit 6e61448123
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/python/api2_2x/Scene.c
View File

@@ -1307,6 +1307,7 @@ static PyObject *SceneObSeq_new( BPy_SceneObSeq * self, PyObject *args )
if( !PyArg_ParseTuple( args, "O", &py_data ) )
return EXPP_ReturnPyObjError( PyExc_TypeError,
"expected an object as argument" );
if (py_data == Py_None) {
type = OB_EMPTY;
} else if( Camera_CheckPyObject( py_data ) ) {
@@ -1339,8 +1340,9 @@ static PyObject *SceneObSeq_new( BPy_SceneObSeq * self, PyObject *args )
/* have we set data to something good? */
if( data ) {
((ID *)object->data)->us++;
object = alloc_libblock( &( G.main->object ), ID_OB, ((ID *)data)->name + 2 );
object->data = data;
((ID *)data)->us++;
} else {
if (type != OB_EMPTY) {
return EXPP_ReturnPyObjError( PyExc_AttributeError,
@@ -1350,7 +1352,6 @@ static PyObject *SceneObSeq_new( BPy_SceneObSeq * self, PyObject *args )
object = alloc_libblock( &( G.main->object ), ID_OB, "Empty" );
}
object->data = data;
object->flag = SELECT;
object->type = type;