diff options
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/blender_copybuffer.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/idcode.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/blender_copybuffer.c b/source/blender/blenkernel/intern/blender_copybuffer.c index f78eefa0a27..8619db34d93 100644 --- a/source/blender/blenkernel/intern/blender_copybuffer.c +++ b/source/blender/blenkernel/intern/blender_copybuffer.c @@ -84,7 +84,7 @@ bool BKE_copybuffer_save(Main *bmain_src, const char *filename, ReportList *repo bool BKE_copybuffer_read(Main *bmain_dst, const char *libname, ReportList *reports, - const unsigned int id_types_mask) + const uint64_t id_types_mask) { BlendHandle *bh = BLO_blendhandle_from_file(libname, reports); if (bh == NULL) { @@ -117,7 +117,7 @@ int BKE_copybuffer_paste(bContext *C, const char *libname, const short flag, ReportList *reports, - const unsigned int id_types_mask) + const uint64_t id_types_mask) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); 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: \ |