archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

IDs: change FILTER_ID_* to 64 bit to make space for new ID types

Browse Source 
And change file browser to boolean from bitflag enum, which is only 32 bit.

Differential Revision: https://developer.blender.org/D7004
This commit is contained in:
Brecht Van Lommel
2020-03-03 17:21:28 +01:00
committed by Brecht Van Lommel
parent 19785b96c4
commit 2841b2be39
13 changed files with 220 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/blender_copybuffer.c
View File

@@ -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);