diff options
| author | Lukas Steiblys <imbusy@imbusy.org> | 2009-10-02 02:29:15 +0400 |
|---|---|---|
| committer | Lukas Steiblys <imbusy@imbusy.org> | 2009-10-02 02:29:15 +0400 |
| commit | 0677398a649b6b8c293df3ce3c6668f0a3be3bc8 (patch) | |
| tree | 9d510a5bd23559bf4fae670ed04d7e5d6c12578c /source/blender/makesrna/RNA_types.h | |
| parent | 59248e9f62006ba05e3098e4d213f3dcb23fe711 (diff) | |
| parent | bc942eceacb638735dc4f4f68252c4c207147a70 (diff) | |
merge from 23153 to 23595soc-2009-imbusy
Diffstat (limited to 'source/blender/makesrna/RNA_types.h')
| -rw-r--r-- | source/blender/makesrna/RNA_types.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index c6fed5cd8e6..98df8c34d58 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -89,13 +89,15 @@ typedef enum PropertySubType { /* strings */ PROP_FILEPATH = 1, PROP_DIRPATH = 2, + PROP_FILENAME = 3, /* numbers */ PROP_UNSIGNED = 13, PROP_PERCENTAGE = 14, - PROP_ANGLE = 15|PROP_UNIT_ROTATION, - PROP_TIME = 16|PROP_UNIT_TIME, - PROP_DISTANCE = 17|PROP_UNIT_LENGTH, + PROP_FACTOR = 15, + PROP_ANGLE = 16|PROP_UNIT_ROTATION, + PROP_TIME = 17|PROP_UNIT_TIME, + PROP_DISTANCE = 18|PROP_UNIT_LENGTH, /* number arrays */ PROP_COLOR = 20, @@ -106,11 +108,9 @@ typedef enum PropertySubType { PROP_MATRIX = 25, PROP_EULER = 26|PROP_UNIT_ROTATION, PROP_QUATERNION = 27, - PROP_XYZ = 28, - PROP_RGB = 29, - - /* pointers */ - PROP_NEVER_NULL = 30, + PROP_AXISANGLE = 28, + PROP_XYZ = 29, + PROP_RGB = 30, /* booleans */ PROP_LAYER = 40, @@ -148,6 +148,7 @@ typedef enum PropertyFlag { /* pointers */ PROP_ID_REFCOUNT = 64, + PROP_NEVER_NULL = 262144, /* internal flags */ PROP_BUILTIN = 128, |