From 634f8f90fe21c35dd9b26a3f5542aa5fb75a1a8d Mon Sep 17 00:00:00 2001 From: Matt Pharr Date: Sat, 30 Oct 2021 06:31:13 -0700 Subject: [PATCH] Cleanup logic in ResolveFilename() --- src/pbrt/util/file.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pbrt/util/file.cpp b/src/pbrt/util/file.cpp index 491e839..87acb32 100644 --- a/src/pbrt/util/file.cpp +++ b/src/pbrt/util/file.cpp @@ -67,9 +67,7 @@ std::string RemoveExtension(std::string filename) { } std::string ResolveFilename(std::string filename) { - if (searchDirectory.empty() || filename.empty()) - return filename; - else if (IsAbsolutePath(filename)) + if (searchDirectory.empty() || filename.empty() || IsAbsolutePath(filename)) return filename; else return (searchDirectory / filesystem::path(filename)).make_absolute().str(); -- GitLab