diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-10 14:48:22 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-10 14:50:04 +0300 |
commit | 96a7e06792902837c1be01652c76d73870449308 (patch) | |
tree | 22eb65f137ee775af4ac3e1ac4a2a3bb0744fcfb | |
parent | 062935976249135fc24e00c361f5c13103cbbfe8 (diff) |
Cleanup: unused struct member
Also replace intptr_t -> int (no good reason to cast to intptr here).
-rw-r--r-- | source/blender/blenloader/intern/readfile.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/intern/dna_genfile.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index 04411880036..8ac500a2e74 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -94,10 +94,6 @@ typedef struct FileData { ListBase *mainlist; ListBase *old_mainlist; /* Used for undo. */ - /* ick ick, used to return - * data through streamglue. - */ - BlendFileData **bfd_r; struct ReportList *reports; } FileData; diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index d4dd34e44d6..70389430ddc 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -597,7 +597,7 @@ static bool init_structDNA( /* Calculate 'sdna->pointerlen' */ { - intptr_t nr = DNA_struct_find_nr(sdna, "ListBase"); + const int nr = DNA_struct_find_nr(sdna, "ListBase"); /* should never happen, only with corrupt file for example */ if (UNLIKELY(nr == -1)) { |