diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-06 12:55:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-06 12:55:45 +0100 |
commit | b30e6496bdc640422b5d708f27acb860a927425f (patch) | |
tree | d1eba0971b63f8f8e39e6f2752fc8d9944960318 /thirdparty/assimp/code/PostProcessing/ComputeUVMappingProcess.cpp | |
parent | 245c99175c242bdc60a212cc84986b1a9ad5aa08 (diff) | |
parent | 5fb160c7c692c469488f11aca90a36ac3248dfee (diff) | |
download | redot-engine-b30e6496bdc640422b5d708f27acb860a927425f.tar.gz |
Merge pull request #33347 from RevoluPowered/demo/assimp-importer-fbx
FBX Skinning and batch of fixes
Diffstat (limited to 'thirdparty/assimp/code/PostProcessing/ComputeUVMappingProcess.cpp')
-rw-r--r-- | thirdparty/assimp/code/PostProcessing/ComputeUVMappingProcess.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/thirdparty/assimp/code/PostProcessing/ComputeUVMappingProcess.cpp b/thirdparty/assimp/code/PostProcessing/ComputeUVMappingProcess.cpp index bb571a551b..df4d44337d 100644 --- a/thirdparty/assimp/code/PostProcessing/ComputeUVMappingProcess.cpp +++ b/thirdparty/assimp/code/PostProcessing/ComputeUVMappingProcess.cpp @@ -354,12 +354,12 @@ void ComputeUVMappingProcess::ComputePlaneMapping(aiMesh* mesh,const aiVector3D& } else if (axis * base_axis_z >= angle_epsilon) { FindMeshCenter(mesh, center, min, max); - diffu = max.y - min.y; - diffv = max.z - min.z; + diffu = max.x - min.x; + diffv = max.y - min.y; for (unsigned int pnt = 0; pnt < mesh->mNumVertices;++pnt) { const aiVector3D& pos = mesh->mVertices[pnt]; - out[pnt].Set((pos.y - min.y) / diffu,(pos.x - min.x) / diffv,0.0); + out[pnt].Set((pos.x - min.x) / diffu,(pos.y - min.y) / diffv,0.0); } } // slower code path in case the mapping axis is not one of the coordinate system axes |