Merge pull request #82 from CyberAgentGameEntertainment/fix/explicit_…

…lerp ApplyTintColor()内のlerpの引数の型を明示するよう修正
CyberAgentGameEntertainment · Aug 9, 2024 · add843f · add843f
2 parents 6d7c17a + d517a9f
commit add843f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Assets/Nova/Runtime/Core/Shaders/ParticlesUber.hlsl b/Assets/Nova/Runtime/Core/Shaders/ParticlesUber.hlsl
@@ -445,7 +445,7 @@ inline void ApplyTintColor(in out half4 color, half2 uv, half progress, half ble
     #elif defined(_TINT_MAP_ENABLED) || defined(_TINT_MAP_3D_ENABLED)
     tintColor = SAMPLE_TINT_MAP(uv, progress);
     #endif
-    color *= lerp(1, tintColor, saturate(blendRate));
+    color *= lerp(half4(1, 1, 1, 1), tintColor, saturate(blendRate));
 }
 
 // Apply the color correction.