Merge branch 'master' into master

2019-12-13 09:17:06 +01:00
parent 453eeb65cd b2ea762b02
commit 2fc72c8f72
5 changed files with 202 additions and 0 deletions
--- a/code/glTF2/glTF2Importer.cpp
+++ b/code/glTF2/glTF2Importer.cpp
@@ -202,6 +202,7 @@ inline void SetMaterialTextureProperty(std::vector<int> &embeddedTexIdxs, Asset
 		}

        mat->AddProperty(&uri, AI_MATKEY_TEXTURE(texType, texSlot));
+        mat->AddProperty(&prop.texCoord, 1, AI_MATKEY_GLTF_TEXTURE_TEXCOORD(texType, texSlot));

 		if (prop.textureTransformSupported) {
 			aiUVTransform transform;