Merge branch 'master' into added_check_before_using

2020-04-28 18:33:29 +00:00
parent 4dfdbbf171 dafff4da5d
commit 6967a02fcb
117 changed files with 4331 additions and 3667 deletions
@@ -382,7 +382,12 @@ namespace glTF
        {
            friend struct Accessor;

-            Accessor& accessor;
+        // This field is reported as not used, making it protectd is the easiest way to work around it without going to the bottom of what the problem is:
+        // ../code/glTF2/glTF2Asset.h:392:19: error: private field 'accessor' is not used [-Werror,-Wunused-private-field]
+        protected:
+            Accessor &accessor;
+
+        private:
            uint8_t* data;
            size_t elemSize, stride;