diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-03-15 20:24:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-15 20:26:23 +0400 |
| commit | 2097e621edcf7658895b9f6ba9cc4e51f5538369 (patch) | |
| tree | 9f112e8a2b35fed01734ed355d3832cd857de826 /source/blender/blenloader | |
| parent | 38244166b03bc4a01d8c0b99e2fd2cb2c9b60012 (diff) | |
Code cleanup: use r_ prefix for return args
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index bf81e0b4e21..4ab3afcaa0c 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -7156,7 +7156,7 @@ static BHead *read_data_into_oldnewmap(FileData *fd, BHead *bhead, const char *a return bhead; } -static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, int flag, ID **id_r) +static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, int flag, ID **r_id) { /* this routine reads a libblock and its direct data. Use link functions * to connect it all @@ -7168,8 +7168,8 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, int flag, ID /* read libblock */ id = read_struct(fd, bhead, "lib block"); - if (id_r) - *id_r = id; + if (r_id) + *r_id = id; if (!id) return blo_nextbhead(fd, bhead); @@ -8928,7 +8928,7 @@ ID *BLO_library_append_named_part_ex(const bContext *C, Main *mainl, BlendHandle return append_named_part_ex(C, mainl, fd, idname, idcode, flag); } -static void append_id_part(FileData *fd, Main *mainvar, ID *id, ID **id_r) +static void append_id_part(FileData *fd, Main *mainvar, ID *id, ID **r_id) { BHead *bhead; @@ -8939,7 +8939,7 @@ static void append_id_part(FileData *fd, Main *mainvar, ID *id, ID **id_r) id->flag &= ~LIB_READ; id->flag |= LIB_NEED_EXPAND; // printf("read lib block %s\n", id->name); - read_libblock(fd, mainvar, bhead, id->flag, id_r); + read_libblock(fd, mainvar, bhead, id->flag, r_id); break; } |