Commit: 96a7e06792902837c1be01652c76d73870449308
Author: Campbell Barton
Date: Sun Feb 10 22:48:22 2019 +1100
Branches: master
https://developer.blender.org/rB96a7e06792902837c1be01652c76d73870449308
Cleanup: unused struct member
Also replace intptr_t -> int (no good reason to cast to intptr here).
===================================================================
M source/blender/blenloader/intern/readfile.h
M source/blender/makesdna/intern/dna_genfile.c
===================================================================
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)) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
