Merge from 2.5 r20991 through r21037
[blender.git] / source / blender / makesrna / intern / rna_internal_types.h
index 3a5a4fa1ced21ab8c9fa9005bd69a4b95f3c666a..8bae21cca2b1f622e7492b1433d86f341499c7e9 100644 (file)
@@ -37,6 +37,7 @@ struct ReportList;
 struct CollectionPropertyIterator;
 struct bContext;
 struct IDProperty;
+struct GHash;
 
 #define RNA_MAX_ARRAY 32
 
@@ -83,6 +84,7 @@ typedef PointerRNA (*PropCollectionLookupStringFunc)(struct PointerRNA *ptr, con
 typedef struct ContainerRNA {
        void *next, *prev;
 
+       struct GHash *prophash;
        ListBase properties;
 } ContainerRNA;
 
@@ -245,6 +247,7 @@ typedef struct CollectionPropertyRNA {
        PropCollectionLengthFunc length;                                /* optional */
        PropCollectionLookupIntFunc lookupint;                  /* optional */
        PropCollectionLookupStringFunc lookupstring;    /* optional */
+       FunctionRNA *add, *remove;
 
        struct StructRNA *type;
 } CollectionPropertyRNA;