diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:07:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:12:28 +0300 |
| commit | 58dc114615449b8fc13e3b05ec3c21390547f5c7 (patch) | |
| tree | 1d0ff6108d39c3bbcc98e0443e3a437ec5a97399 /source/blender/blenloader | |
| parent | d2ea1b2dcd536cc8a9e53bd830f0095f6bf9e2fe (diff) | |
| parent | 18d7fbe4f58c86f6f91b1e9e5c1f7f0c593a1d0f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 2e4ff1c96a6..ccf2dc1f4c4 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -884,7 +884,7 @@ BHead *blo_nextbhead(FileData *fd, BHead *thisblock) return(bhead); } -/* Warning! Caller's responsability to ensure given bhead **is** and ID one! */ +/* Warning! Caller's responsibility to ensure given bhead **is** and ID one! */ const char *bhead_id_name(const FileData *fd, const BHead *bhead) { return (const char *)POINTER_OFFSET(bhead, sizeof(*bhead) + fd->id_name_offs); |