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

Change default part base as PartBase::Average

master
huxingyi 2020-04-11 22:06:19 +09:30
parent da138a2124
commit 24e8af2352
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/meshgenerator.cpp
View File

@ -1711,10 +1711,14 @@ void MeshGenerator::remesh(const std::vector<OutcomeNode> &inputNodes,
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);
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(",")) {
if (childIdString.isEmpty())
continue;
@ -1727,8 +1731,6 @@ void MeshGenerator::collectIncombinableMesh(const MeshCombiner::Mesh *mesh, cons
if (nullptr == mesh)
return;
m_isSuccessful = false;
std::vector<QVector3D> uncombinedVertices;
std::vector<std::vector<size_t>> uncombinedFaces;
mesh->fetch(uncombinedVertices, uncombinedFaces);

2
src/skeletondocument.h
View File

@ -190,7 +190,7 @@ public:
disabled(false),
xMirrored(false),
zMirrored(false),
base(PartBase::XYZ),
base(PartBase::Average),
deformThickness(1.0),
deformWidth(1.0),
rounded(false),