sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

hash update from stable

Browse Source
This commit is contained in:
Campbell Barton 2007-08-29 03:09:22 +00:00
parent 18478d1e62
commit 1e3b8dc5d7
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/python/api2_2x/gen_library.c
View File

@ -325,17 +325,8 @@ PyObject *GetPyObjectFromID( ID * id )
Py_RETURN_NONE;
}
/* return a unique tuple for this libdata*/
long GenericLib_hash(PyObject * pydata)
long GenericLib_hash(BPy_GenericLib * pydata)
{
ID *id = ((BPy_GenericLib *)pydata)->id;
PyObject *pyhash = PyTuple_New( 2 );
long hash;
PyTuple_SetItem( pyhash, 0, PyString_FromString(id->name) );
if (id->lib) PyTuple_SetItem( pyhash, 1, PyString_FromString(id->lib->name) );
else PyTuple_SetItem( pyhash, 1, EXPP_incr_ret(Py_None) );
hash = PyObject_Hash(pyhash);
Py_DECREF(pyhash);
return hash;
return (long)pydata->id;
}

2
source/blender/python/api2_2x/gen_library.h
View File

@ -90,5 +90,5 @@ short GenericLib_getType(PyObject * pydata);
/* Other ID functions */
ID *GetIdFromList( ListBase * list, char *name );
PyObject *GetPyObjectFromID( ID * id );
long GenericLib_hash(PyObject * pydata);
long GenericLib_hash(BPy_GenericLib * pydata);
#endif /* EXPP_gen_library_h */