diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index 58913b23..26979830 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/Switch_FileFormatsMain/Switch_FileFormatsMain.csproj b/Switch_FileFormatsMain/Switch_FileFormatsMain.csproj index 0e899388..6c70a473 100644 --- a/Switch_FileFormatsMain/Switch_FileFormatsMain.csproj +++ b/Switch_FileFormatsMain/Switch_FileFormatsMain.csproj @@ -1270,6 +1270,8 @@ - + + + \ No newline at end of file diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache index 10f210dc..543ec2ab 100644 Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Toolbox/Shader/Bfres/BFRES_Debug.frag b/Toolbox/Shader/Bfres/BFRES_Debug.frag index 415780b7..88b720d5 100644 --- a/Toolbox/Shader/Bfres/BFRES_Debug.frag +++ b/Toolbox/Shader/Bfres/BFRES_Debug.frag @@ -217,7 +217,10 @@ void main() } if (HasSpecularMap == 1) { - specIntensity = texture(SpecularMap, f_texcoord0).rgb; + if (uking_texture2_texcoord == 1) + specIntensity = texture(SpecularMap, f_texcoord1).rgb; + else + specIntensity = texture(SpecularMap, f_texcoord0).rgb; } if (renderType == 1) // normals vertexColor