From da6861f6aacaba40651f9e60bdf7279f32d0bb72 Mon Sep 17 00:00:00 2001 From: Jeremy Hu Date: Tue, 13 Aug 2019 07:48:21 +0930 Subject: [PATCH] Fix build --- src/meshgenerator.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/meshgenerator.cpp b/src/meshgenerator.cpp index ac277e1a..31e8e59c 100644 --- a/src/meshgenerator.cpp +++ b/src/meshgenerator.cpp @@ -891,12 +891,12 @@ nodemesh::Combiner::Mesh *MeshGenerator::combineComponentMesh(const QString &com } QString componentChildGroupIdStringListString = componentChildGroupIdStringList.join("|"); 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); if (nullptr == subGroupMesh) continue; - groupMeshes.push_back({subGroupMesh, group.first, subGroupMeshIdStringList.join("&")}); + groupMeshes.push_back(std::make_tuple(subGroupMesh, group.first, subGroupMeshIdStringList.join("&"))); } mesh = combineMultipleMeshes(groupMeshes, false); } @@ -1004,7 +1004,7 @@ nodemesh::Combiner::Mesh *MeshGenerator::combineComponentChildGroupMesh(const st continue; } - multipleMeshes.push_back({subMesh, childCombineMode, childIdString}); + multipleMeshes.push_back(std::make_tuple(subMesh, childCombineMode, childIdString)); } return combineMultipleMeshes(multipleMeshes); }