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

===Python API===

Browse Source 
Bugfix for #4971: Scene.unlink() was incorrectly decrementing the datablock
user count whenever an object was removed from a scene, instead of only when
the object's count reached 0.  The Python code was modified to use the
existing free_and_unlink_base() function (with some modifications to allow
specifying a scene).  Also fixed a bug with the undocumented return codes
from the method; it now returns True if the object was found in the scene.
This commit is contained in:
Ken Hughes
2006-09-08 18:31:09 +00:00
parent 1b6cf3e6ee
commit f108325904
4 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,7 @@ struct View3D;
#include "BIF_drawscene.h" /* for set_scene */
#include "BIF_space.h" /* for copy_view3d_lock() */
#include "BIF_screen.h" /* curarea */
#include "BDR_editobject.h" /* free_and_unlink_base() */
#include "mydevice.h" /* for #define REDRAW */
#include "DNA_view3d_types.h"
/* python types */
@@ -824,10 +825,8 @@ static PyObject *Scene_link( BPy_Scene * self, PyObject * args )
static PyObject *Scene_unlink( BPy_Scene * self, PyObject * args )
{
BPy_Object *bpy_obj = NULL;
Object *object;
Scene *scene = self->scene;
Base *base;
short retval = 0;
if( !scene )
return EXPP_ReturnPyObjError( PyExc_RuntimeError,
@@ -837,27 +836,16 @@ static PyObject *Scene_unlink( BPy_Scene * self, PyObject * args )
return EXPP_ReturnPyObjError( PyExc_TypeError,
"expected Object as argument" );
object = bpy_obj->object;
/* is the object really in the scene? */
base = object_in_scene( object, scene );
base = object_in_scene( bpy_obj->object, scene );
if( base ) { /* if it is, remove it */
/* check that there is a data block before decrementing refcount */
if( (ID *)object->data )
((ID *)object->data)->us--;
else if( object->type != OB_EMPTY )
return EXPP_ReturnPyObjError( PyExc_RuntimeError,
"Object has no data!" );
BLI_remlink( &scene->base, base );
object->id.us--;
MEM_freeN( base );
scene->basact = 0; /* in case the object was selected */
retval = 1;
free_and_unlink_base_from_scene( scene, base );
scene->basact = NULL; /* in case the object was selected */
Py_RETURN_TRUE;
}
return Py_BuildValue( "i", PyInt_FromLong( retval ) );
else
Py_RETURN_FALSE;
}
/*-----------------------Scene.getChildren()-----------------------------*/

2
source/blender/python/api2_2x/doc/Scene.py
View File

@@ -233,6 +233,8 @@ class Scene:
Unlink an Object from this Scene.
@type object: Blender Object
@param object: A Blender Object.
@rtype: boolean
@return: true if object was found in the scene.
"""
def getScriptLinks (event):