Merge branch 'master' into FBXMeshGeometry_checksizes_fix
commit
eb1d25631b
|
@ -250,7 +250,7 @@ aiNode* COBImporter::BuildNodes(const Node& root,const Scene& scin,aiScene* fill
|
|||
const Mesh& ndmesh = (const Mesh&)(root);
|
||||
if (ndmesh.vertex_positions.size() && ndmesh.texture_coords.size()) {
|
||||
|
||||
typedef std::pair<unsigned int,Mesh::FaceRefList> Entry;
|
||||
typedef std::pair<const unsigned int,Mesh::FaceRefList> Entry;
|
||||
for(const Entry& reflist : ndmesh.temp_map) {
|
||||
{ // create mesh
|
||||
size_t n = 0;
|
||||
|
|
|
@ -1312,7 +1312,6 @@ void SceneCombiner::Copy(aiMetadata** _dest, const aiMetadata* src) {
|
|||
aiMetadata* dest = *_dest = aiMetadata::Alloc( src->mNumProperties );
|
||||
std::copy(src->mKeys, src->mKeys + src->mNumProperties, dest->mKeys);
|
||||
|
||||
dest->mValues = new aiMetadataEntry[src->mNumProperties];
|
||||
for (unsigned int i = 0; i < src->mNumProperties; ++i) {
|
||||
aiMetadataEntry& in = src->mValues[i];
|
||||
aiMetadataEntry& out = dest->mValues[i];
|
||||
|
|
|
@ -323,7 +323,7 @@ public:
|
|||
// oh well.
|
||||
bool have_param = false, have_point = false;
|
||||
IfcVector3 point;
|
||||
for(const Entry sel :entity.Trim1) {
|
||||
for(const Entry& sel :entity.Trim1) {
|
||||
if (const ::Assimp::STEP::EXPRESS::REAL* const r = sel->ToPtr<::Assimp::STEP::EXPRESS::REAL>()) {
|
||||
range.first = *r;
|
||||
have_param = true;
|
||||
|
@ -340,7 +340,7 @@ public:
|
|||
}
|
||||
}
|
||||
have_param = false, have_point = false;
|
||||
for(const Entry sel :entity.Trim2) {
|
||||
for(const Entry& sel :entity.Trim2) {
|
||||
if (const ::Assimp::STEP::EXPRESS::REAL* const r = sel->ToPtr<::Assimp::STEP::EXPRESS::REAL>()) {
|
||||
range.second = *r;
|
||||
have_param = true;
|
||||
|
|
|
@ -1421,11 +1421,11 @@ void MDLImporter::InternReadFile_3DGS_MDL7( )
|
|||
avOutList[i].reserve(3);
|
||||
|
||||
// buffer to held the names of all groups in the file
|
||||
const size_t buffersize( AI_MDL7_MAX_GROUPNAMESIZE*pcHeader->groups_num );
|
||||
char* aszGroupNameBuffer = new char[ buffersize ];
|
||||
const size_t buffersize(AI_MDL7_MAX_GROUPNAMESIZE*pcHeader->groups_num);
|
||||
char* aszGroupNameBuffer = new char[ buffersize ];
|
||||
|
||||
// read all groups
|
||||
for (unsigned int iGroup = 0; iGroup < (unsigned int)pcHeader->groups_num;++iGroup) {
|
||||
for (unsigned int iGroup = 0; iGroup < (unsigned int)pcHeader->groups_num; ++iGroup) {
|
||||
MDL::IntGroupInfo_MDL7 groupInfo((BE_NCONST MDL::Group_MDL7*)szCurrent,iGroup);
|
||||
szCurrent = (const unsigned char*)(groupInfo.pcGroup+1);
|
||||
|
||||
|
|
|
@ -685,7 +685,7 @@ bool XGLImporter::ReadMesh(TempScope& scope)
|
|||
}
|
||||
|
||||
// finally extract output meshes and add them to the scope
|
||||
typedef std::pair<unsigned int, TempMaterialMesh> pairt;
|
||||
typedef std::pair<const unsigned int, TempMaterialMesh> pairt;
|
||||
for(const pairt& p : bymat) {
|
||||
aiMesh* const m = ToOutputMesh(p.second);
|
||||
scope.meshes_linear.push_back(m);
|
||||
|
|
Loading…
Reference in New Issue