Skip to content

Commit

Permalink
Correct problem with fix for PixarAnimationStudios#1329. When symlink…
Browse files Browse the repository at this point in the history
… resolution was removed, so

was any testing for whether or not the "Resolve" call succeeded. This change
restores the looping to look for an existing tile file rather than always
returning the attempted resolution of the first tile file.
  • Loading branch information
marktucker committed Feb 26, 2022
1 parent ff1e6fd commit 7f19ba1
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pxr/usdImaging/usdImaging/materialParamUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ _ResolvedPathForFirstTile(
// naming pattern but the files that are linked do not. We'll
// let whoever consumes the pattern determine if they want to
// resolve symlinks themselves.
return resolver.Resolve(path);
path = resolver.Resolve(path);
if (!path.empty())
return path;
}
return std::string();
}
Expand Down

0 comments on commit 7f19ba1

Please sign in to comment.