Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht>2020-03-03 19:21:28 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-03-03 19:34:21 +0300
commit2841b2be3949b7592b50cd2ebd03b9b32a5f2058 (patch)
tree36b583a61bdf14150b8061d3f349610d781696de /source/blender/blenloader
parent19785b96c43f6dc19906f4b39a18a656684826b1 (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/blenloader')
-rw-r--r--source/blender/blenloader/BLO_readfile.h6
-rw-r--r--source/blender/blenloader/intern/readfile.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h
index ee7877b1a5d..00dbe334356 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -19,6 +19,8 @@
#ifndef __BLO_READFILE_H__
#define __BLO_READFILE_H__
+#include "BLI_sys_types.h"
+
/** \file
* \ingroup blenloader
* \brief external readfile function prototypes.
@@ -145,9 +147,7 @@ void BLO_library_link_end(struct Main *mainl,
struct ViewLayer *view_layer,
const struct View3D *v3d);
-int BLO_library_link_copypaste(struct Main *mainl,
- BlendHandle *bh,
- const unsigned int id_types_mask);
+int BLO_library_link_copypaste(struct Main *mainl, BlendHandle *bh, const uint64_t id_types_mask);
void *BLO_library_read_struct(struct FileData *fd, struct BHead *bh, const char *blockname);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index d97fe900679..c1f61db27c3 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -11259,7 +11259,7 @@ static ID *link_named_part(
/**
* Simple reader for copy/paste buffers.
*/
-int BLO_library_link_copypaste(Main *mainl, BlendHandle *bh, const unsigned int id_types_mask)
+int BLO_library_link_copypaste(Main *mainl, BlendHandle *bh, const uint64_t id_types_mask)
{
FileData *fd = (FileData *)(bh);
BHead *bhead;