Merge branch 'master' into issue_2024

code/BlenderLoader.cpp

@@ -1045,7 +1045,9 @@ void BlenderImporter::ConvertMesh(const Scene& /*in*/, const Object* /*obj*/, co
                 }
             }
         }
-        matTexUvMappings.insert(std::make_pair(m, texuv));
+        if (texuv.size()) {
+            matTexUvMappings.insert(std::make_pair(m, texuv));
+        }
     }
 
     // collect texture coordinates, they're stored in a separate per-face buffer

code/BlenderScene.cpp

@@ -800,7 +800,6 @@ template <> void Structure::Convert<CustomData>(
     ) const
 {
     ReadFieldArray<ErrorPolicy_Warn>(dest.typemap, "typemap", db);
-    ReadField<ErrorPolicy_Igno>(dest.pad_i1, "pad_i1", db);
     ReadField<ErrorPolicy_Warn>(dest.totlayer, "totlayer", db);
     ReadField<ErrorPolicy_Warn>(dest.maxlayer, "maxlayer", db);
     ReadField<ErrorPolicy_Warn>(dest.totsize, "totsize", db);

code/BlenderScene.h

@@ -432,7 +432,6 @@ CustomData 208
 struct CustomData : ElemBase {
     vector<std::shared_ptr<struct CustomDataLayer> > layers;
     int typemap[42];    // CD_NUMTYPES
-    int pad_i1;
     int totlayer;
     int maxlayer;
     int totsize;