From 523ad30655ba219a50cc28e33c1cc625023e1955 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Tue, 28 Aug 2012 17:55:20 +0200 Subject: [PATCH] Changed: #1440 Fallback to filename only instead of using fallback texture --HG-- branch : build_pipeline_v3 --- code/nel/tools/pipeline/max_rewrite_assets/main.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/code/nel/tools/pipeline/max_rewrite_assets/main.cpp b/code/nel/tools/pipeline/max_rewrite_assets/main.cpp index c5ae9d3cb..b543d48eb 100644 --- a/code/nel/tools/pipeline/max_rewrite_assets/main.cpp +++ b/code/nel/tools/pipeline/max_rewrite_assets/main.cpp @@ -83,8 +83,10 @@ bool RunningLinux = true; //const char *SrcDirectoryRecursive = "w:\\database\\"; //const char *SrcDirectoryRecursive = "w:\\database\\stuff\\fyros\\city\\newpositionville\\"; const char *SrcDirectoryRecursiveInit = "w:\\database\\"; -const char *SrcDirectoryRecursiveHandle = "w:\\database\\stuff\\generique\\agents\\accessories\\"; +//const char *SrcDirectoryRecursiveHandle = "w:\\database\\stuff\\generique\\agents\\accessories\\"; +const char *SrcDirectoryRecursiveHandle = "w:\\database\\"; +bool UseFallbackTga = false; const char *FallbackTga = "w:\\database\\stuff\\generique\\agents\\_textures\\accessories\\lost_texture.tga"; std::set MissingFiles; @@ -644,7 +646,14 @@ std::string rewritePathFinal(const std::string &str) ) { // nlwarning("Replacing missing '%s' with '%s'", result.c_str(), FallbackTga); - return FallbackTga; + if (UseFallbackTga) + { + return FallbackTga; + } + else + { + return NLMISC::CFile::getFilename(result); + } } // nldebug("Replacing '%s' with '%s'", str.c_str(), result.c_str()); return result;