[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11877] trunk/blender/source/blender/ python/api2_2x: hash update from stable

[Campbell Barton]

Revision: 11877
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11877
Author:   campbellbarton
Date:     2007-08-29 05:09:22 +0200 (Wed, 29 Aug 2007)

Log Message:
-----------
hash update from stable

Modified Paths:
--------------
    trunk/blender/source/blender/python/api2_2x/gen_library.c
    trunk/blender/source/blender/python/api2_2x/gen_library.h

Modified: trunk/blender/source/blender/python/api2_2x/gen_library.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/gen_library.c	2007-08-29 01:57:48 UTC (rev 11876)
+++ trunk/blender/source/blender/python/api2_2x/gen_library.c	2007-08-29 03:09:22 UTC (rev 11877)
@@ -325,17 +325,8 @@
 	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;
 }
 

Modified: trunk/blender/source/blender/python/api2_2x/gen_library.h
===================================================================
--- trunk/blender/source/blender/python/api2_2x/gen_library.h	2007-08-29 01:57:48 UTC (rev 11876)
+++ trunk/blender/source/blender/python/api2_2x/gen_library.h	2007-08-29 03:09:22 UTC (rev 11877)
@@ -90,5 +90,5 @@
 /* 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 */