zcy
/
dust3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build

master
Jeremy Hu 2019-08-13 07:48:21 +09:30
parent 30fbfad8f9
commit da6861f6aa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/meshgenerator.cpp
View File

@ -891,12 +891,12 @@ nodemesh::Combiner::Mesh *MeshGenerator::combineComponentMesh(const QString &com
} }
QString componentChildGroupIdStringListString = componentChildGroupIdStringList.join("|"); QString componentChildGroupIdStringListString = componentChildGroupIdStringList.join("|");
subGroupMeshIdStringList += componentChildGroupIdStringListString; subGroupMeshIdStringList += componentChildGroupIdStringListString;
multipleMeshes.push_back({childMesh, CombineMode::Normal, componentChildGroupIdStringListString}); multipleMeshes.push_back(std::make_tuple(childMesh, CombineMode::Normal, componentChildGroupIdStringListString));
} }
nodemesh::Combiner::Mesh *subGroupMesh = combineMultipleMeshes(multipleMeshes, foundColorSolubilitySetting); nodemesh::Combiner::Mesh *subGroupMesh = combineMultipleMeshes(multipleMeshes, foundColorSolubilitySetting);
if (nullptr == subGroupMesh) if (nullptr == subGroupMesh)
continue; continue;
groupMeshes.push_back({subGroupMesh, group.first, subGroupMeshIdStringList.join("&")}); groupMeshes.push_back(std::make_tuple(subGroupMesh, group.first, subGroupMeshIdStringList.join("&")));
} }
mesh = combineMultipleMeshes(groupMeshes, false); mesh = combineMultipleMeshes(groupMeshes, false);
} }
@ -1004,7 +1004,7 @@ nodemesh::Combiner::Mesh *MeshGenerator::combineComponentChildGroupMesh(const st
continue; continue;
} }
multipleMeshes.push_back({subMesh, childCombineMode, childIdString}); multipleMeshes.push_back(std::make_tuple(subMesh, childCombineMode, childIdString));
} }
return combineMultipleMeshes(multipleMeshes); return combineMultipleMeshes(multipleMeshes);
} }