diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-04-28 16:37:19 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-04-28 16:40:12 +0300 |
| commit | 6278b48ea18cc93cc49eb1515d937fd1edc84537 (patch) | |
| tree | 861d133155a8e59757800954929876c65647da2c /source/blender/makesdna | |
| parent | 1c7317a6dad11b3473733097be3677a58e4be619 (diff) | |
| parent | 37e08e526c6fef7d0a4fc359bc4b7e665d012119 (diff) | |
Merge branch 'blender-v2.83-release'
Conflicts:
source/blender/blenkernel/intern/lib_query.c
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index ba1485004ae..289f8c7a7b9 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -106,6 +106,18 @@ enum { IDP_NUMTYPES = 10, }; +/** Used by some IDP utils, keep values in sync with type enum above. */ +enum { + IDP_TYPE_FILTER_STRING = 1 << 0, + IDP_TYPE_FILTER_INT = 1 << 1, + IDP_TYPE_FILTER_FLOAT = 1 << 2, + IDP_TYPE_FILTER_ARRAY = 1 << 5, + IDP_TYPE_FILTER_GROUP = 1 << 6, + IDP_TYPE_FILTER_ID = 1 << 7, + IDP_TYPE_FILTER_DOUBLE = 1 << 8, + IDP_TYPE_FILTER_IDPARRAY = 1 << 9, +}; + /*->subtype */ /* IDP_STRING */ |