diff options
| -rw-r--r-- | source/blender/blenloader/BLO_readfile.h | 15 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 25 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files_link.c | 21 |
4 files changed, 38 insertions, 25 deletions
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h index 59bd7ed74f4..4fd2e227bc5 100644 --- a/source/blender/blenloader/BLO_readfile.h +++ b/source/blender/blenloader/BLO_readfile.h @@ -109,13 +109,22 @@ void BLO_blendhandle_close(BlendHandle *bh); bool BLO_has_bfile_extension(const char *str); bool BLO_library_path_explode(const char *path, char *r_dir, char **r_group, char **r_name); +/* Options controlling behavior of append/link code. + * Note: merged with 'user-level' options from operators etc. in 16 lower bits + * (see eFileSel_Params_Flag in DNA_space_types.h). */ +typedef enum BLO_LibLinkFlags { + /* Generate a placeholder (empty ID) if not found in current lib file. */ + BLO_LIBLINK_USE_PLACEHOLDERS = 1 << 16, + /* Force loaded ID to be tagged as LIB_TAG_INDIRECT (used in reload context only). */ + BLO_LIBLINK_FORCE_INDIRECT = 1 << 17, +} BLO_LinkFlags; + struct Main *BLO_library_link_begin(struct Main *mainvar, BlendHandle **bh, const char *filepath); struct ID *BLO_library_link_named_part(struct Main *mainl, BlendHandle **bh, const short idcode, const char *name); struct ID *BLO_library_link_named_part_ex( struct Main *mainl, BlendHandle **bh, - const short idcode, const char *name, const short flag, - struct Scene *scene, struct View3D *v3d, - const bool use_placeholders, const bool force_indirect); + const short idcode, const char *name, const int flag, + struct Scene *scene, struct View3D *v3d); void BLO_library_link_end(struct Main *mainl, BlendHandle **bh, short flag, struct Scene *scene, struct View3D *v3d); void BLO_library_link_copypaste(struct Main *mainl, BlendHandle *bh); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index fb45fdc8136..caf58ba3f86 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -10035,12 +10035,14 @@ static ID *create_placeholder(Main *mainvar, const short idcode, const char *idn /* returns true if the item was found * but it may already have already been appended/linked */ static ID *link_named_part( - Main *mainl, FileData *fd, const short idcode, const char *name, - const bool use_placeholders, const bool force_indirect) + Main *mainl, FileData *fd, const short idcode, const char *name, const int flag) { BHead *bhead = find_bhead_from_code_name(fd, idcode, name); ID *id; + const bool use_placeholders = (flag & BLO_LIBLINK_USE_PLACEHOLDERS) != 0; + const bool force_indirect = (flag & BLO_LIBLINK_FORCE_INDIRECT) != 0; + BLI_assert(BKE_idcode_is_linkable(idcode) && BKE_idcode_is_valid(idcode)); if (bhead) { @@ -10080,7 +10082,7 @@ static ID *link_named_part( return id; } -static void link_object_postprocess(ID *id, Scene *scene, View3D *v3d, const short flag) +static void link_object_postprocess(ID *id, Scene *scene, View3D *v3d, const int flag) { if (scene) { Base *base; @@ -10146,10 +10148,10 @@ void BLO_library_link_copypaste(Main *mainl, BlendHandle *bh) } static ID *link_named_part_ex( - Main *mainl, FileData *fd, const short idcode, const char *name, const short flag, - Scene *scene, View3D *v3d, const bool use_placeholders, const bool force_indirect) + Main *mainl, FileData *fd, const short idcode, const char *name, const int flag, + Scene *scene, View3D *v3d) { - ID *id = link_named_part(mainl, fd, idcode, name, use_placeholders, force_indirect); + ID *id = link_named_part(mainl, fd, idcode, name, flag); if (id && (GS(id->name) == ID_OB)) { /* loose object: give a base */ link_object_postprocess(id, scene, v3d, flag); @@ -10175,7 +10177,7 @@ static ID *link_named_part_ex( ID *BLO_library_link_named_part(Main *mainl, BlendHandle **bh, const short idcode, const char *name) { FileData *fd = (FileData*)(*bh); - return link_named_part(mainl, fd, idcode, name, false, false); + return link_named_part(mainl, fd, idcode, name, 0); } /** @@ -10189,18 +10191,15 @@ ID *BLO_library_link_named_part(Main *mainl, BlendHandle **bh, const short idcod * \param flag Options for linking, used for instantiating. * \param scene The scene in which to instantiate objects/groups (if NULL, no instantiation is done). * \param v3d The active View3D (only to define active layers for instantiated objects & groups, can be NULL). - * \param use_placeholders If true, generate a placeholder (empty ID) if not found in current lib file. - * \param force_indirect If true, force loaded ID to be tagged as LIB_TAG_INDIRECT (used in reload context only). * \return the linked ID when found. */ ID *BLO_library_link_named_part_ex( Main *mainl, BlendHandle **bh, - const short idcode, const char *name, const short flag, - Scene *scene, View3D *v3d, - const bool use_placeholders, const bool force_indirect) + const short idcode, const char *name, const int flag, + Scene *scene, View3D *v3d) { FileData *fd = (FileData*)(*bh); - return link_named_part_ex(mainl, fd, idcode, name, flag, scene, v3d, use_placeholders, force_indirect); + return link_named_part_ex(mainl, fd, idcode, name, flag, scene, v3d); } static void link_id_part(ReportList *reports, FileData *fd, Main *mainvar, ID *id, ID **r_id) diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 015583d898c..693917939ef 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -707,6 +707,8 @@ typedef enum eFileSel_Action { } eFileSel_Action; /* sfile->params->flag and simasel->flag */ +/* Note: short flag, also used as 16 lower bits of flags in link/append code + * (WM and BLO code area, see BLO_LibLinkFlags in BLO_readfile.h). */ typedef enum eFileSel_Params_Flag { FILE_SHOWSHORT = (1 << 0), FILE_RELPATH = (1 << 1), /* was FILE_STRINGCODE */ diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index ad71ce1aad9..05c569cbaac 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -157,7 +157,7 @@ typedef struct WMLinkAppendData { LinkNodePair items; int num_libraries; int num_items; - short flag; + int flag; /* Combines eFileSel_Params_Flag from DNA_space_types.h and BLO_LibLinkFlags from BLO_readfile.h */ /* Internal 'private' data */ MemArena *memarena; @@ -211,9 +211,7 @@ static WMLinkAppendDataItem *wm_link_append_data_item_add( return item; } -static void wm_link_do( - WMLinkAppendData *lapp_data, ReportList *reports, Main *bmain, Scene *scene, View3D *v3d, - const bool use_placeholders, const bool force_indirect) +static void wm_link_do(WMLinkAppendData *lapp_data, ReportList *reports, Main *bmain, Scene *scene, View3D *v3d) { Main *mainl; BlendHandle *bh; @@ -260,8 +258,7 @@ static void wm_link_do( continue; } - new_id = BLO_library_link_named_part_ex( - mainl, &bh, item->idcode, item->name, flag, scene, v3d, use_placeholders, force_indirect); + new_id = BLO_library_link_named_part_ex(mainl, &bh, item->idcode, item->name, flag, scene, v3d); if (new_id) { /* If the link is successful, clear item's libs 'todo' flags. @@ -332,6 +329,8 @@ static int wm_link_append_exec(bContext *C, wmOperator *op) scene = NULL; } + /* We need to add nothing from BLO_LibLinkFlags to flag here. */ + /* from here down, no error returns */ if (scene && RNA_boolean_get(op->ptr, "autoselect")) { @@ -405,7 +404,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op) /* XXX We'd need re-entrant locking on Main for this to work... */ /* BKE_main_lock(bmain); */ - wm_link_do(lapp_data, op->reports, bmain, scene, CTX_wm_view3d(C), false, false); + wm_link_do(lapp_data, op->reports, bmain, scene, CTX_wm_view3d(C)); /* BKE_main_unlock(bmain); */ @@ -594,7 +593,7 @@ static void lib_relocate_do( BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, true); /* We do not want any instanciation here! */ - wm_link_do(lapp_data, reports, bmain, NULL, NULL, do_reload, do_reload); + wm_link_do(lapp_data, reports, bmain, NULL, NULL); BKE_main_lock(bmain); @@ -758,7 +757,7 @@ void WM_lib_reload(Library *lib, bContext *C, ReportList *reports) return; } - WMLinkAppendData *lapp_data = wm_link_append_data_new(0); + WMLinkAppendData *lapp_data = wm_link_append_data_new(BLO_LIBLINK_USE_PLACEHOLDERS | BLO_LIBLINK_FORCE_INDIRECT); wm_link_append_data_library_add(lapp_data, lib->filepath); @@ -869,6 +868,10 @@ static int wm_lib_relocate_exec_do(bContext *C, wmOperator *op, bool do_reload) } } + if (do_reload) { + lapp_data->flag |= BLO_LIBLINK_USE_PLACEHOLDERS | BLO_LIBLINK_FORCE_INDIRECT; + } + lib_relocate_do(bmain, scene, lib, lapp_data, op->reports, do_reload); wm_link_append_data_free(lapp_data); |