Change default part base as PartBase::Average
parent
da138a2124
commit
24e8af2352
|
@ -1711,10 +1711,14 @@ void MeshGenerator::remesh(const std::vector<OutcomeNode> &inputNodes,
|
||||||
|
|
||||||
void MeshGenerator::collectIncombinableComponentMeshes(const QString &componentIdString)
|
void MeshGenerator::collectIncombinableComponentMeshes(const QString &componentIdString)
|
||||||
{
|
{
|
||||||
const auto &componentCache = m_cacheContext->components[componentIdString];
|
|
||||||
for (const auto &mesh: componentCache.incombinableMeshes)
|
|
||||||
collectIncombinableMesh(mesh, componentCache);
|
|
||||||
const auto &component = findComponent(componentIdString);
|
const auto &component = findComponent(componentIdString);
|
||||||
|
if (CombineMode::Uncombined == componentCombineMode(component))
|
||||||
|
return;
|
||||||
|
const auto &componentCache = m_cacheContext->components[componentIdString];
|
||||||
|
for (const auto &mesh: componentCache.incombinableMeshes) {
|
||||||
|
m_isSuccessful = false;
|
||||||
|
collectIncombinableMesh(mesh, componentCache);
|
||||||
|
}
|
||||||
for (const auto &childIdString: valueOfKeyInMapOrEmpty(*component, "children").split(",")) {
|
for (const auto &childIdString: valueOfKeyInMapOrEmpty(*component, "children").split(",")) {
|
||||||
if (childIdString.isEmpty())
|
if (childIdString.isEmpty())
|
||||||
continue;
|
continue;
|
||||||
|
@ -1726,8 +1730,6 @@ void MeshGenerator::collectIncombinableMesh(const MeshCombiner::Mesh *mesh, cons
|
||||||
{
|
{
|
||||||
if (nullptr == mesh)
|
if (nullptr == mesh)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_isSuccessful = false;
|
|
||||||
|
|
||||||
std::vector<QVector3D> uncombinedVertices;
|
std::vector<QVector3D> uncombinedVertices;
|
||||||
std::vector<std::vector<size_t>> uncombinedFaces;
|
std::vector<std::vector<size_t>> uncombinedFaces;
|
||||||
|
|
|
@ -190,7 +190,7 @@ public:
|
||||||
disabled(false),
|
disabled(false),
|
||||||
xMirrored(false),
|
xMirrored(false),
|
||||||
zMirrored(false),
|
zMirrored(false),
|
||||||
base(PartBase::XYZ),
|
base(PartBase::Average),
|
||||||
deformThickness(1.0),
|
deformThickness(1.0),
|
||||||
deformWidth(1.0),
|
deformWidth(1.0),
|
||||||
rounded(false),
|
rounded(false),
|
||||||
|
|
Loading…
Reference in New Issue