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

2016-12-25 23:59:06 -08:00 · 2016-12-25 23:59:06 -08:00 · f6b3a2aea8
parent 7b79e52740 136557eeaf
commit f6b3a2aea8
2 changed files with 1 additions and 1 deletions
--- a/Editor/ProjectResourceFactoryBase.cpp
+++ b/Editor/ProjectResourceFactoryBase.cpp
@ -69,7 +69,7 @@ void ProjectResourceFactoryBase::ReadCatalog(const hecl::ProjectPath& catalogPat
            continue;

        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)
        {
            path = hecl::ProjectPath(m_proj->getProjectWorkingPath(), node.m_scalarString);
--- a/Editor/platforms/win/mainicon.ico
+++ b/Editor/platforms/win/mainicon.ico