From 87ae8aaa576af6c601fca21402840a4130cc6386 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sun, 19 Mar 2017 20:59:14 -1000 Subject: [PATCH] Windows fixes --- hecl/lib/Blender/BlenderConnection.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hecl/lib/Blender/BlenderConnection.cpp b/hecl/lib/Blender/BlenderConnection.cpp index 9cd61e90d..0169fffb2 100644 --- a/hecl/lib/Blender/BlenderConnection.cpp +++ b/hecl/lib/Blender/BlenderConnection.cpp @@ -1164,8 +1164,9 @@ BlenderConnection::DataStream::MapUniverse::World::World(BlenderConnection& conn path.assign(pathLen, '\0'); conn._readBuf(&path[0], pathLen); + hecl::SystemStringView sysPath(path); SystemString pathRel = - conn.m_loadedBlend.getProject().getProjectRootPath().getProjectRelativeFromAbsolute(path); + conn.m_loadedBlend.getProject().getProjectRootPath().getProjectRelativeFromAbsolute(sysPath.sys_str()); worldPath.assign(conn.m_loadedBlend.getProject().getProjectWorkingPath(), pathRel); } } @@ -1180,8 +1181,9 @@ BlenderConnection::DataStream::MapUniverse::MapUniverse(BlenderConnection& conn) path.assign(pathLen, '\0'); conn._readBuf(&path[0], pathLen); + hecl::SystemStringView sysPath(path); SystemString pathRel = - conn.m_loadedBlend.getProject().getProjectRootPath().getProjectRelativeFromAbsolute(path); + conn.m_loadedBlend.getProject().getProjectRootPath().getProjectRelativeFromAbsolute(sysPath.sys_str()); hexagonPath.assign(conn.m_loadedBlend.getProject().getProjectWorkingPath(), pathRel); }