From 4d16af29baebf8edbf80a7651fa760002ced31fd Mon Sep 17 00:00:00 2001 From: psi29a Date: Sat, 17 Sep 2022 16:41:04 +0000 Subject: [PATCH] Merge branch 'fix_shader_prefix' into 'master' Use nv_default shader prefix for unhandled types See merge request OpenMW/openmw!2419 (cherry picked from commit 92680ab9cfc8af5e064fde3c6bd3b310e5a08e8a) 63b51ead Use nv_default shader prefix for unhandled types --- components/nifosg/nifloader.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp index fab39049e0..b9965ad264 100644 --- a/components/nifosg/nifloader.cpp +++ b/components/nifosg/nifloader.cpp @@ -1829,10 +1829,10 @@ namespace NifOsg case Nif::BSShaderType::ShaderType_Lighting30: case Nif::BSShaderType::ShaderType_Tile: Log(Debug::Warning) << "Unhandled BSShaderType " << type << " in " << mFilename; - return std::string_view(); + return "nv_default"; } Log(Debug::Warning) << "Unknown BSShaderType " << type << " in " << mFilename; - return std::string_view(); + return "nv_default"; } std::string_view getBSLightingShaderPrefix(unsigned int type) const @@ -1861,10 +1861,10 @@ namespace NifOsg case Nif::BSLightingShaderType::ShaderType_MultitexLandLODBlend: case Nif::BSLightingShaderType::ShaderType_Dismemberment: Log(Debug::Warning) << "Unhandled BSLightingShaderType " << type << " in " << mFilename; - return std::string_view(); + return "nv_default"; } Log(Debug::Warning) << "Unknown BSLightingShaderType " << type << " in " << mFilename; - return std::string_view(); + return "nv_default"; } void handleProperty(const Nif::Property *property,