diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-15 17:04:04 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-15 17:12:00 +0300 |
| commit | fa3dd5d9f43253898ed2a387d07f8fd3cd52f0c6 (patch) | |
| tree | de8ceba6aba70a7eb3a6b596cd09d2de37f35a2e /source/blender/blenloader/BLO_readfile.h | |
| parent | 25f79d97deb713fe8d0984f765529808986fbcee (diff) | |
Cleanup: BLO_read: linking API arg order and name.
linking API funcs would use 'name, idcode', when all other code here uses
(more sensible) 'idcode, name'.
Also, use 'name' arg name when we expect a bare name, without the prepended ID code, and
'idname' arg name when we expect a complete ID name.
And here too, idcode shall be short, not int!
Diffstat (limited to 'source/blender/blenloader/BLO_readfile.h')
| -rw-r--r-- | source/blender/blenloader/BLO_readfile.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h index c203f651680..51b016a77f8 100644 --- a/source/blender/blenloader/BLO_readfile.h +++ b/source/blender/blenloader/BLO_readfile.h @@ -96,10 +96,10 @@ 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); 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 char *idname, const int idcode); +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 char *idname, const int idcode, const short flag, + const short idcode, const char *name, const short 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); |