AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/urde

This commit is contained in:
Phillip Stephens 2016-12-25 23:59:06 -08:00
parent 7b79e52740 136557eeaf
commit f6b3a2aea8
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Editor/ProjectResourceFactoryBase.cpp
View File

@ -69,7 +69,7 @@ void ProjectResourceFactoryBase::ReadCatalog(const hecl::ProjectPath& catalogPat
continue; continue;
athena::io::YAMLNode& node = *p.second; athena::io::YAMLNode& node = *p.second;
hecl::ProjectPath path(m_proj->getProjectWorkingPath(), node.m_scalarString); hecl::ProjectPath path;
if (node.m_type == YAML_SCALAR_NODE) if (node.m_type == YAML_SCALAR_NODE)
{ {
path = hecl::ProjectPath(m_proj->getProjectWorkingPath(), node.m_scalarString); path = hecl::ProjectPath(m_proj->getProjectWorkingPath(), node.m_scalarString);

BIN
Editor/platforms/win/mainicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 93 KiB

After

Width:  |  Height:  |  Size: 169 KiB