Merge with -r 22620:23107.
[blender.git] / source / blender / makesrna / RNA_types.h
index 51c3645..3932816 100644 (file)
@@ -111,6 +111,10 @@ typedef enum PropertySubType {
 
        /* pointers */
        PROP_NEVER_NULL = 30,
+
+       /* booleans */
+       PROP_LAYER = 40,
+       PROP_LAYER_MEMBER = 41
 } PropertySubType;
 
 typedef enum PropertyFlag {
@@ -145,9 +149,6 @@ typedef enum PropertyFlag {
        /* pointers */
        PROP_ID_REFCOUNT = 64,
 
-       /* arrays */
-       PROP_DYNAMIC_ARRAY = 32768,
-
        /* internal flags */
        PROP_BUILTIN = 128,
        PROP_EXPORT = 256,
@@ -155,7 +156,8 @@ typedef enum PropertyFlag {
        PROP_IDPROPERTY = 1024,
        PROP_RAW_ACCESS = 8192,
        PROP_RAW_ARRAY = 16384,
-       PROP_FREE_POINTERS = 32768
+       PROP_FREE_POINTERS = 32768,
+       PROP_DYNAMIC = 131072 /* for dynamic arrays and function retvals of string type */
 } PropertyFlag;
 
 typedef struct CollectionPropertyIterator {
@@ -178,11 +180,11 @@ typedef struct CollectionPointerLink {
 } CollectionPointerLink;
 
 typedef enum RawPropertyType {
-       PROP_RAW_CHAR,
+       PROP_RAW_INT, // XXX - abused for types that are not set, eg. MFace.verts, needs fixing.
        PROP_RAW_SHORT,
-       PROP_RAW_INT,
-       PROP_RAW_FLOAT,
-       PROP_RAW_DOUBLE
+       PROP_RAW_CHAR,
+       PROP_RAW_DOUBLE,
+       PROP_RAW_FLOAT
 } RawPropertyType;
 
 typedef struct RawArray {