Merge branch 'fix_shader_prefix' into 'master'

Use nv_default shader prefix for unhandled types

See merge request OpenMW/openmw!2419
make_linux_ci_do_zoomies
psi29a 2 years ago
commit 92680ab9cf

@ -1884,10 +1884,10 @@ namespace NifOsg
case Nif::BSShaderType::ShaderType_Lighting30: case Nif::BSShaderType::ShaderType_Lighting30:
case Nif::BSShaderType::ShaderType_Tile: case Nif::BSShaderType::ShaderType_Tile:
Log(Debug::Warning) << "Unhandled BSShaderType " << type << " in " << mFilename; Log(Debug::Warning) << "Unhandled BSShaderType " << type << " in " << mFilename;
return std::string_view(); return "nv_default";
} }
Log(Debug::Warning) << "Unknown BSShaderType " << type << " in " << mFilename; Log(Debug::Warning) << "Unknown BSShaderType " << type << " in " << mFilename;
return std::string_view(); return "nv_default";
} }
std::string_view getBSLightingShaderPrefix(unsigned int type) const std::string_view getBSLightingShaderPrefix(unsigned int type) const
@ -1916,10 +1916,10 @@ namespace NifOsg
case Nif::BSLightingShaderType::ShaderType_MultitexLandLODBlend: case Nif::BSLightingShaderType::ShaderType_MultitexLandLODBlend:
case Nif::BSLightingShaderType::ShaderType_Dismemberment: case Nif::BSLightingShaderType::ShaderType_Dismemberment:
Log(Debug::Warning) << "Unhandled BSLightingShaderType " << type << " in " << mFilename; Log(Debug::Warning) << "Unhandled BSLightingShaderType " << type << " in " << mFilename;
return std::string_view(); return "nv_default";
} }
Log(Debug::Warning) << "Unknown BSLightingShaderType " << type << " in " << mFilename; Log(Debug::Warning) << "Unknown BSLightingShaderType " << type << " in " << mFilename;
return std::string_view(); return "nv_default";
} }
void handleProperty(const Nif::Property *property, void handleProperty(const Nif::Property *property,

Loading…
Cancel
Save