From c0de894cdb05f9300b1ebc4e39bc1d4fa458b7f1 Mon Sep 17 00:00:00 2001 From: Mark Tucker Date: Fri, 25 Feb 2022 22:34:41 -0500 Subject: [PATCH] Correct problem with fix for #1329. When symlink 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. --- pxr/usdImaging/usdImaging/materialParamUtils.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pxr/usdImaging/usdImaging/materialParamUtils.cpp b/pxr/usdImaging/usdImaging/materialParamUtils.cpp index 16adad3530..89cb7cce90 100644 --- a/pxr/usdImaging/usdImaging/materialParamUtils.cpp +++ b/pxr/usdImaging/usdImaging/materialParamUtils.cpp @@ -119,7 +119,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(); }