AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-14 19:25:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #167 from lioncash/flatten

Browse Source 
SpecBase: Flatten loop within flattenDependenciesBlend()
This commit is contained in:
Luke S 2020-02-28 10:35:15 -05:00 committed by GitHub
commit c8809f0ed3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DataSpec/SpecBase.cpp
View File

@ -283,11 +283,11 @@ void SpecBase::flattenDependenciesBlend(const hecl::ProjectPath& in, std::vector
if (!conn.openBlend(in)) if (!conn.openBlend(in))
return; return;
switch (conn.getBlendType()) { switch (conn.getBlendType()) {
case hecl::blender::BlendType::Mesh: { case hecl::blender::BlendType::Mesh:
case hecl::blender::BlendType::Area: {
hecl::blender::DataStream ds = conn.beginData(); hecl::blender::DataStream ds = conn.beginData();
std::vector<hecl::ProjectPath> texs = ds.getTextures(); std::vector<hecl::ProjectPath> texs = ds.getTextures();
for (const hecl::ProjectPath& tex : texs) pathsOut.insert(pathsOut.end(), std::make_move_iterator(texs.begin()), std::make_move_iterator(texs.end()));
pathsOut.push_back(tex);
break; break;
} }
case hecl::blender::BlendType::Actor: { case hecl::blender::BlendType::Actor: {
@ -379,13 +379,6 @@ void SpecBase::flattenDependenciesBlend(const hecl::ProjectPath& in, std::vector
pathsOut.push_back(asGlob); pathsOut.push_back(asGlob);
return; return;
} }
case hecl::blender::BlendType::Area: {
hecl::blender::DataStream ds = conn.beginData();
std::vector<hecl::ProjectPath> texs = ds.getTextures();
for (const hecl::ProjectPath& tex : texs)
pathsOut.push_back(tex);
break;
}
default: default:
break; break;
} }