moved python functions that deal with blender libdata into gen_library.c from gen_utils and BPY_interface

small cleanup, removed unused functions and explicetly cast pointers..

1 files changed, 1 insertions, 53 deletions

diff --git a/source/blender/python/api2_2x/gen_utils.h b/source/blender/python/api2_2x/gen_utils.h
index 2e4a52a286b..636e45b609e 100644
--- a/source/blender/python/api2_2x/gen_utils.h
+++ b/source/blender/python/api2_2x/gen_utils.h
@@ -68,10 +68,6 @@ int EXPP_VectorsAreEqual(float *vecA, float *vecB, int size, int floatSteps);
 PyObject *EXPP_GetModuleConstant(char *module, char *constant);
 
 int StringEqual( const char *string1, const char *string2 );
-char *GetIdName( ID * id );
-int SetIdFakeUser( ID * id, PyObject *value);
-
-ID *GetIdFromList( ListBase * list, char *name );
 
 PyObject *PythonReturnErrorObject( PyObject * type, char *error_msg );
 PyObject *PythonIncRef( PyObject * object );
@@ -158,53 +154,5 @@ void EXPP_allqueue(unsigned short event, short val);
 /* helper to keep dictionaries from causing memory leaks */
 int EXPP_dict_set_item_str( PyObject *dict, char *key, PyObject *value);
 
-
-
-
-
-/* Dummy struct for getting the ID from a libdata BPyObject */
-typedef struct {
-	PyObject_HEAD		/* required python macro */
-	ID *id;
-} BPy_GenericLib;
-
-
-/* ID functions for all libdata */
-#define	GENERIC_LIB_GETSETATTR \
-	{"name",\
-	 (getter)GenericLib_getName, (setter)GenericLib_setName,\
-	 "name",\
-	 NULL},\
-	{"lib",\
-	 (getter)GenericLib_getLib, (setter)NULL,\
-	 "external library path",\
-	 NULL},\
-	{"users",\
-	 (getter)GenericLib_getUsers, (setter)NULL,\
-	 "user count",\
-	 NULL},\
-	{"fakeUser",\
-	 (getter)GenericLib_getFakeUser, (setter)GenericLib_setFakeUser,\
-	 "fake user state",\
-	 NULL},\
-	{"properties",\
-	 (getter)GenericLib_getProperties, (setter)NULL,\
-	 "properties",\
-	 NULL}
-
-
-int GenericLib_setName( void *self, PyObject *value );
-PyObject *GenericLib_getName( void *self );
-PyObject *GenericLib_getFakeUser( void *self );
-int GenericLib_setFakeUser( void *self, PyObject *value );
-PyObject *GenericLib_getLib( void *self );
-PyObject *GenericLib_getUsers( void *self );
-PyObject *GenericLib_getProperties( void *self );
-
-/* use this for oldstyle somedata.getName("name") */
-PyObject * GenericLib_setName_with_method( void *self, PyObject *value ); 
-
-int GenericLib_assignData(PyObject *value, void **data, void **ndata, short refcount, short type, short subtype);
-short GenericLib_getType(PyObject * pydata);
-
 #endif				/* EXPP_gen_utils_h */
+