v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'assimp:master' into master

pull/5294/head
copycd 2023-10-25 13:51:08 +09:00 committed by GitHub
parent 34a356ba52 c44e3427aa
commit 1c94dd088c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssetLib/IFC/IFCOpenings.cpp
View File

@ -1372,7 +1372,7 @@ std::vector<IfcVector2> GetContourInPlane2D(const std::shared_ptr<TempMesh>& mes
const std::vector<IfcVector3>& va = mesh->mVerts; const std::vector<IfcVector3>& va = mesh->mVerts;
if(va.size() <= 2) { if(va.size() <= 2) {
std::stringstream msg; std::stringstream msg;
msg << "Skipping: Only " << va.size() << " verticies in opening mesh."; msg << "Skipping: Only " << va.size() << " vertices in opening mesh.";
IFCImporter::LogDebug(msg.str().c_str()); IFCImporter::LogDebug(msg.str().c_str());
ok = false; ok = false;
return contour; return contour;

4
code/AssetLib/Irr/IRRLoader.cpp
View File

@ -575,8 +575,8 @@ void SetupMapping(aiMaterial *mat, aiTextureMapping mode, const aiVector3D &axis
m->mSemantic = prop->mSemantic; m->mSemantic = prop->mSemantic;
m->mType = aiPTI_Float; m->mType = aiPTI_Float;
m->mDataLength = 12; m->mDataLength = sizeof(aiVector3D);
m->mData = new char[12]; m->mData = new char[m->mDataLength];
*((aiVector3D *)m->mData) = axis; *((aiVector3D *)m->mData) = axis;
p.push_back(m); p.push_back(m);
} }