From 9c8e36b5696529749e8f813848cdb9624684b068 Mon Sep 17 00:00:00 2001 From: manavortex Date: Thu, 13 Jun 2024 12:06:46 +0200 Subject: [PATCH] fixed material path substitution checks --- Scripts/Internal/FileValidation/00_shared.wscript | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Scripts/Internal/FileValidation/00_shared.wscript b/Scripts/Internal/FileValidation/00_shared.wscript index e4fa671..4723e55 100644 --- a/Scripts/Internal/FileValidation/00_shared.wscript +++ b/Scripts/Internal/FileValidation/00_shared.wscript @@ -143,7 +143,7 @@ export function checkDepotPath(_depotPath, _info, allowEmpty = false, suppressLo case 'ent': warnAboutSubstitution = entSettings.warnAboutSubstitution; case 'mesh': - warnAboutSubstitution = meshSettings.enabled;; + warnAboutSubstitution = meshSettings.enabled; default: warnAboutSubstitution = false; } @@ -160,22 +160,23 @@ export function checkDepotPath(_depotPath, _info, allowEmpty = false, suppressLo if (wkit.FileExists(resolvedPath)) { return; } - // File does not exist - ret = false; - if (suppressLogOutput || !warnAboutSubstitution) { + if (suppressLogOutput) { return; } + + // File does not exist + ret = false; - if ( shouldHaveSubstitution(resolvedPath, true)) { + if (warnAboutSubstitution && shouldHaveSubstitution(resolvedPath, true)) { Logger.Info(`${info}${resolvedPath}: substitution couldn't be resolved. It's either invalid or not yet supported in Wolvenkit.`); return; } + if (!!currentMaterialName) { Logger.Info(`${info}${resolvedPath}: substitution couldn't be resolved. It may not be defined yet.`); return; } - Logger.Warning(`${info}${resolvedPath} not found in project or game files`); }) return ret;