From a5e14db19b0bfbaa59bd7ad6ded65ab7acb3dd8d Mon Sep 17 00:00:00 2001 From: kimkulling Date: Thu, 26 Apr 2018 15:41:31 +0200 Subject: [PATCH] fix invaid macro usage. --- code/DXFLoader.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/DXFLoader.cpp b/code/DXFLoader.cpp index 7d8b6eca2..c77d13a7e 100644 --- a/code/DXFLoader.cpp +++ b/code/DXFLoader.cpp @@ -373,7 +373,7 @@ void DXFImporter::ExpandBlockReferences(DXF::Block& bl,const DXF::BlockMap& bloc // first check if the referenced blocks exists ... const DXF::BlockMap::const_iterator it = blocks_by_name.find(insert.name); if (it == blocks_by_name.end()) { - ASSIMP_LOG_ERROR("DXF: Failed to resolve block reference: ", insert.name,"; skipping" ); + ASSIMP_LOG_ERROR_F("DXF: Failed to resolve block reference: ", insert.name,"; skipping" ); continue; } @@ -406,7 +406,6 @@ void DXFImporter::ExpandBlockReferences(DXF::Block& bl,const DXF::BlockMap& bloc } } - // ------------------------------------------------------------------------------------------------ void DXFImporter::GenerateMaterials(aiScene* pScene, DXF::FileData& /*output*/) { @@ -433,7 +432,6 @@ void DXFImporter::GenerateMaterials(aiScene* pScene, DXF::FileData& /*output*/) pScene->mMaterials[0] = pcMat; } - // ------------------------------------------------------------------------------------------------ void DXFImporter::GenerateHierarchy(aiScene* pScene, DXF::FileData& /*output*/) { @@ -444,9 +442,7 @@ void DXFImporter::GenerateHierarchy(aiScene* pScene, DXF::FileData& /*output*/) if (1 == pScene->mNumMeshes) { pScene->mRootNode->mMeshes = new unsigned int[ pScene->mRootNode->mNumMeshes = 1 ]; pScene->mRootNode->mMeshes[0] = 0; - } - else - { + } else { pScene->mRootNode->mChildren = new aiNode*[ pScene->mRootNode->mNumChildren = pScene->mNumMeshes ]; for (unsigned int m = 0; m < pScene->mRootNode->mNumChildren;++m) { aiNode* p = pScene->mRootNode->mChildren[m] = new aiNode();