Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp

This commit is contained in:
Enrico Turri 2018-05-23 15:33:25 +02:00
commit 486180c422
15 changed files with 7984 additions and 4804 deletions

View file

@ -95,7 +95,7 @@ const std::string& var_dir()
std::string var(const std::string &file_name)
{
auto file = boost::filesystem::canonical(boost::filesystem::path(g_var_dir) / file_name).make_preferred();
auto file = (boost::filesystem::path(g_var_dir) / file_name).make_preferred();
return file.string();
}