mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-25 20:39:43 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_shader_prefix' into 'master'

Browse source 
Use nv_default shader prefix for unhandled types

See merge request OpenMW/openmw!2419

(cherry picked from commit 92680ab9cf)

63b51ead Use nv_default shader prefix for unhandled types
This commit is contained in:
psi29a 2022-09-17 16:41:04 +00:00 committed by elsid
parent 847e2bbeaf
commit 4d16af29ba
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/nifosg/nifloader.cpp
View file

@ -1829,10 +1829,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
@ -1861,10 +1861,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,