Reverted incorrect merge (missing files)

svn up -r 21247
svn merge -r 21247:21246 . (<= revert incorrect: merge -r 21041:21243)
svn up

source/blender/python/generic/vector.h

@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: vector.h 20332 2009-05-22 03:22:56Z campbellbarton $
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -37,20 +37,14 @@ extern PyTypeObject vector_Type;
 
 #define VectorObject_Check(v) (((PyObject *)v)->ob_type == &vector_Type)
 
-typedef struct { /* keep aligned with BaseMathObject in Mathutils.h */
+typedef struct {
 	PyObject_VAR_HEAD 
-	float *vec;					/*1D array of data (alias), wrapped status depends on wrapped status */
-	PyObject *cb_user;					/* if this vector references another object, otherwise NULL, *Note* this owns its reference */
-	unsigned char cb_type;	/* which user funcs do we adhere to, RNA, GameObject, etc */
-	unsigned char cb_subtype;		/* subtype: location, rotation... to avoid defining many new functions for every attribute of the same type */
-	unsigned char wrapped;		/* wrapped data type? */
-	/* end BaseMathObject */
-
-	unsigned char size;			/* vec size 2,3 or 4 */
+	float *vec;				/*1D array of data (alias), wrapped status depends on wrapped status */
+	short size;				/* vec size 2,3 or 4 */
+	short wrapped;			/* is wrapped data? */
 } VectorObject;
 
 /*prototypes*/
 PyObject *newVectorObject(float *vec, int size, int type);
-PyObject *newVectorObject_cb(PyObject *user, int size, int callback_type, int subtype);
 
 #endif				/* EXPP_vector_h */