diff --git a/package/Shaders/Effect.hlsl b/package/Shaders/Effect.hlsl index 534c05db3..4a501be4c 100644 --- a/package/Shaders/Effect.hlsl +++ b/package/Shaders/Effect.hlsl @@ -622,7 +622,7 @@ PS_OUTPUT main(PS_INPUT input) float4 baseColorMul = float4(1, 1, 1, 1); # else float4 baseColorMul = BaseColor; -# if defined(VC) +# if defined(VC) && !defined(PROJECTED_UV) baseColorMul *= input.Color; # endif # endif @@ -676,7 +676,7 @@ PS_OUTPUT main(PS_INPUT input) # if defined(MEMBRANE) grayscaleToColorUv.y = PropertyColor.x; # endif - baseColor.xyz = BaseColorScale.x * TexGrayscaleSampler.Sample(SampGrayscaleSampler, grayscaleToColorUv).xyz; + baseColor.xyz = baseColorScale * TexGrayscaleSampler.Sample(SampGrayscaleSampler, grayscaleToColorUv).xyz; } float3 lightColor = lerp(baseColor.xyz, propertyColor * baseColor.xyz, lightingInfluence.xxx); diff --git a/src/ShaderCache.cpp b/src/ShaderCache.cpp index 7741e25fa..0c6f504ce 100644 --- a/src/ShaderCache.cpp +++ b/src/ShaderCache.cpp @@ -1742,13 +1742,6 @@ namespace SIE RE::BSGraphics::VertexShader* ShaderCache::GetVertexShader(const RE::BSShader& shader, uint32_t descriptor) { - if (shader.shaderType.get() == RE::BSShader::Type::Effect) { - if (descriptor & static_cast(ShaderCache::EffectShaderFlags::Lighting)) { - } else { - return nullptr; - } - } - if (shader.shaderType == RE::BSShader::Type::ImageSpace) { const auto& isShader = static_cast(shader); if (!SShaderCache::GetImagespaceShaderDescriptor(isShader, descriptor)) { @@ -1791,13 +1784,6 @@ namespace SIE RE::BSGraphics::PixelShader* ShaderCache::GetPixelShader(const RE::BSShader& shader, uint32_t descriptor) { - if (shader.shaderType.get() == RE::BSShader::Type::Effect) { - if (descriptor & static_cast(ShaderCache::EffectShaderFlags::Lighting)) { - } else { - return nullptr; - } - } - auto state = State::GetSingleton(); if (!((ShaderCache::IsSupportedShader(shader) || state->IsDeveloperMode() && state->IsShaderEnabled(shader)) && state->enablePShaders)) { return nullptr;