diff options
author | Brecht Van Lommel <brecht> | 2020-03-03 19:21:28 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-03-03 19:34:21 +0300 |
commit | 2841b2be3949b7592b50cd2ebd03b9b32a5f2058 (patch) | |
tree | 36b583a61bdf14150b8061d3f349610d781696de /source/blender/blenkernel/intern/idcode.c | |
parent | 19785b96c43f6dc19906f4b39a18a656684826b1 (diff) |
IDs: change FILTER_ID_* to 64 bit to make space for new ID types
And change file browser to boolean from bitflag enum, which is only 32 bit.
Differential Revision: https://developer.blender.org/D7004
Diffstat (limited to 'source/blender/blenkernel/intern/idcode.c')
-rw-r--r-- | source/blender/blenkernel/intern/idcode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c index 6b7cb181374..b9ca77ceb67 100644 --- a/source/blender/blenkernel/intern/idcode.c +++ b/source/blender/blenkernel/intern/idcode.c @@ -179,7 +179,7 @@ short BKE_idcode_from_name(const char *name) /** * Convert an idcode into an idfilter (e.g. ID_OB -> FILTER_ID_OB). */ -int BKE_idcode_to_idfilter(const short idcode) +uint64_t BKE_idcode_to_idfilter(const short idcode) { #define CASE_IDFILTER(_id) \ case ID_##_id: \ @@ -227,7 +227,7 @@ int BKE_idcode_to_idfilter(const short idcode) /** * Convert an idfilter into an idcode (e.g. FILTER_ID_OB -> ID_OB). */ -short BKE_idcode_from_idfilter(const int idfilter) +short BKE_idcode_from_idfilter(const uint64_t idfilter) { #define CASE_IDFILTER(_id) \ case FILTER_ID_##_id: \ |