diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-12 14:46:58 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-12 14:47:44 +0300 |
commit | 4bc08d09aedafb8986eb742b8d8c1a0a58876cd5 (patch) | |
tree | 7272500885de768902fba9d426a0f32403fc5502 /source/blender/blenloader/BLO_readfile.h | |
parent | 6af043424d20fb144c477591f5fc645d562ddd99 (diff) |
Cleanup in BLO API: rename 'append' funcs to 'link', since none do append, but only linking of datablocks!
Diffstat (limited to 'source/blender/blenloader/BLO_readfile.h')
-rw-r--r-- | source/blender/blenloader/BLO_readfile.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h index 77bdb99b54b..1ab83a503ec 100644 --- a/source/blender/blenloader/BLO_readfile.h +++ b/source/blender/blenloader/BLO_readfile.h @@ -213,13 +213,13 @@ bool BLO_library_path_explode(const char *path, char *r_dir, char **r_group, cha * \param filepath Used for relative linking, copied to the lib->name * \return the library Main, to be passed to BLO_library_append_named_part as mainl. */ -struct Main *BLO_library_append_begin( +struct Main *BLO_library_link_begin( struct Main *mainvar, BlendHandle **bh, const char *filepath); /** - * Link/Append a named datablock from an external blend file. + * Link a named datablock from an external blend file. * * \param mainl The main database to link from (not the active one). * \param bh The blender file handle. @@ -227,13 +227,13 @@ struct Main *BLO_library_append_begin( * \param idcode The kind of datablock to link. * \return the appended ID when found. */ -struct ID *BLO_library_append_named_part( +struct ID *BLO_library_link_named_part( struct Main *mainl, BlendHandle **bh, const char *idname, const int idcode); /** - * Link/Append a named datablock from an external blend file. - * optionally instance the object in the scene when the flags are set. + * Link a named datablock from an external blend file. + * optionally instantiate the object/group in the scene when the flags are set. * * \param C The context, when NULL instancing object in the scene isn't done. * \param mainl The main database to link from (not the active one). @@ -243,13 +243,13 @@ struct ID *BLO_library_append_named_part( * \param flag Options for linking, used for instancing. * \return the appended ID when found. */ -struct ID *BLO_library_append_named_part_ex( +struct ID *BLO_library_link_named_part_ex( const struct bContext *C, struct Main *mainl, BlendHandle **bh, const char *idname, const int idcode, const short flag); -void BLO_library_append_end(const struct bContext *C, struct Main *mainl, BlendHandle **bh, int idcode, short flag); +void BLO_library_link_end(const struct bContext *C, struct Main *mainl, BlendHandle **bh, int idcode, short flag); -void BLO_library_append_all(struct Main *mainl, BlendHandle *bh); +void BLO_library_link_all(struct Main *mainl, BlendHandle *bh); void *BLO_library_read_struct(struct FileData *fd, struct BHead *bh, const char *blockname); |