Skip to content

MAYA-105710: fix USD files fail to load on mapped mounted volume. #1422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 26, 2021
Merged

MAYA-105710: fix USD files fail to load on mapped mounted volume. #1422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f183eb
MAYA-105710: fix USD file fails to load on mapped mounted volume.
May 18, 2021
6bd9134
- Switched to gulark v 1.5.6 which fixes the bug in ghc::filesystem::…
May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/gulark.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ else()
FetchContent_Declare(
${CONTENT_NAME}
GIT_REPOSITORY https://github.com/gulrak/filesystem.git
GIT_TAG 3d3c02ce35dcc68b5ebb34f21cb1fc507be9a66e
GIT_TAG 4e21ab305794f5309a1454b4ae82ab9a0f5e0d25
Copy link
Contributor Author

@HamedSabri-adsk HamedSabri-adsk May 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switching to v 1.5.6 which fixed the bug in ghc::filesystem::canonical

gulrak/filesystem#124

USES_TERMINAL_DOWNLOAD TRUE
GIT_CONFIG advice.detachedHead=false
)
Expand Down
9 changes: 6 additions & 3 deletions lib/mayaUsd/utils/utilFileSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,16 +143,19 @@ std::string UsdMayaUtilFileSystem::resolveRelativePathWithinMayaContext(
const MObject& proxyShape,
const std::string& relativeFilePath)
{
if (relativeFilePath.length() < 3)
if (relativeFilePath.length() < 3) {
return relativeFilePath;
}

std::string currentFileDir = getMayaReferencedFileDir(proxyShape);

if (currentFileDir.empty())
if (currentFileDir.empty()) {
currentFileDir = getMayaSceneFileDir();
}

if (currentFileDir.empty())
if (currentFileDir.empty()) {
return relativeFilePath;
}

std::error_code errorCode;
auto path = ghc::filesystem::canonical(
Expand Down