diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-12 04:55:20 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-12 05:02:09 +0300 |
commit | 49490e5cfbeb2b0b823aa2042401891001870a6e (patch) | |
tree | a1d32562af2dea0c336ebd3d017a387834e936cc /source/blender/blenloader/intern/readblenentry.c | |
parent | 16fc62e15f0a749d6d64e784ea048e07d6ea3397 (diff) | |
parent | e757c4a3bec8b0e8d198531a28327332af00a9ba (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader/intern/readblenentry.c')
-rw-r--r-- | source/blender/blenloader/intern/readblenentry.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index 6bf0e7bf809..fee648ac5f4 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -75,8 +75,8 @@ void BLO_blendhandle_print_sizes(BlendHandle *, void *); /** * Open a blendhandle from a file path. * - * \param filepath The file path to open. - * \param reports Report errors in opening the file (can be NULL). + * \param filepath: The file path to open. + * \param reports: Report errors in opening the file (can be NULL). * \return A handle on success, or NULL on failure. */ BlendHandle *BLO_blendhandle_from_file(const char *filepath, ReportList *reports) @@ -91,8 +91,8 @@ BlendHandle *BLO_blendhandle_from_file(const char *filepath, ReportList *reports /** * Open a blendhandle from memory. * - * \param mem The data to load from. - * \param memsize The size of the data. + * \param mem: The data to load from. + * \param memsize: The size of the data. * \return A handle on success, or NULL on failure. */ BlendHandle *BLO_blendhandle_from_memory(const void *mem, int memsize) @@ -137,9 +137,9 @@ void BLO_blendhandle_print_sizes(BlendHandle *bh, void *fp) /** * Gets the names of all the datablocks in a file of a certain type (e.g. all the scene names in a file). * - * \param bh The blendhandle to access. - * \param ofblocktype The type of names to get. - * \param tot_names The length of the returned list. + * \param bh: The blendhandle to access. + * \param ofblocktype: The type of names to get. + * \param tot_names: The length of the returned list. * \return A BLI_linklist of strings. The string links should be freed with malloc. */ LinkNode *BLO_blendhandle_get_datablock_names(BlendHandle *bh, int ofblocktype, int *tot_names) @@ -167,9 +167,9 @@ LinkNode *BLO_blendhandle_get_datablock_names(BlendHandle *bh, int ofblocktype, /** * Gets the previews of all the datablocks in a file of a certain type (e.g. all the scene previews in a file). * - * \param bh The blendhandle to access. - * \param ofblocktype The type of names to get. - * \param tot_prev The length of the returned list. + * \param bh: The blendhandle to access. + * \param ofblocktype: The type of names to get. + * \param tot_prev: The length of the returned list. * \return A BLI_linklist of PreviewImage. The PreviewImage links should be freed with malloc. */ LinkNode *BLO_blendhandle_get_previews(BlendHandle *bh, int ofblocktype, int *tot_prev) @@ -265,7 +265,7 @@ LinkNode *BLO_blendhandle_get_previews(BlendHandle *bh, int ofblocktype, int *to /** * Gets the names of all the linkable datablock types available in a file. (e.g. "Scene", "Mesh", "Lamp", etc.). * - * \param bh The blendhandle to access. + * \param bh: The blendhandle to access. * \return A BLI_linklist of strings. The string links should be freed with malloc. */ LinkNode *BLO_blendhandle_get_linkable_groups(BlendHandle *bh) @@ -298,7 +298,7 @@ LinkNode *BLO_blendhandle_get_linkable_groups(BlendHandle *bh) /** * Close and free a blendhandle. The handle becomes invalid after this call. * - * \param bh The handle to close. + * \param bh: The handle to close. */ void BLO_blendhandle_close(BlendHandle *bh) { @@ -313,8 +313,8 @@ void BLO_blendhandle_close(BlendHandle *bh) * Open a blender file from a pathname. The function returns NULL * and sets a report in the list if it cannot open the file. * - * \param filepath The path of the file to open. - * \param reports If the return value is NULL, errors indicating the cause of the failure. + * \param filepath: The path of the file to open. + * \param reports: If the return value is NULL, errors indicating the cause of the failure. * \return The data of the file. */ BlendFileData *BLO_read_from_file( @@ -340,9 +340,9 @@ BlendFileData *BLO_read_from_file( * Open a blender file from memory. The function returns NULL * and sets a report in the list if it cannot open the file. * - * \param mem The file data. - * \param memsize The length of \a mem. - * \param reports If the return value is NULL, errors indicating the cause of the failure. + * \param mem: The file data. + * \param memsize: The length of \a mem. + * \param reports: If the return value is NULL, errors indicating the cause of the failure. * \return The data of the file. */ BlendFileData *BLO_read_from_memory( @@ -367,8 +367,8 @@ BlendFileData *BLO_read_from_memory( /** * Used for undo/redo, skips part of libraries reading (assuming their data are already loaded & valid). * - * \param oldmain old main, from which we will keep libraries and other datablocks that should not have changed. - * \param filename current file, only for retrieving library data. + * \param oldmain: old main, from which we will keep libraries and other datablocks that should not have changed. + * \param filename: current file, only for retrieving library data. */ BlendFileData *BLO_read_from_memfile( Main *oldmain, const char *filename, MemFile *memfile, @@ -469,7 +469,7 @@ BlendFileData *BLO_read_from_memfile( /** * Frees a BlendFileData structure and *all* the data associated with it (the userdef data, and the main libblock data). * - * \param bfd The structure to free. + * \param bfd: The structure to free. */ void BLO_blendfiledata_free(BlendFileData *bfd) { |