mirror of
https://github.com/godotengine/godot.git
synced 2025-12-08 06:09:55 +00:00
Merge pull request #95536 from jsjtxietian/rename-alpha-scissor
Fix undefined `alpha_scissor` in standard shader
This commit is contained in:
commit
851d0a764d
3 changed files with 3 additions and 3 deletions
|
|
@ -1871,7 +1871,7 @@ void main() {
|
||||||
alpha = min(alpha, clamp(length(ambient_light), 0.0, 1.0));
|
alpha = min(alpha, clamp(length(ambient_light), 0.0, 1.0));
|
||||||
|
|
||||||
#if defined(ALPHA_SCISSOR_USED)
|
#if defined(ALPHA_SCISSOR_USED)
|
||||||
if (alpha < alpha_scissor) {
|
if (alpha < alpha_scissor_threshold) {
|
||||||
discard;
|
discard;
|
||||||
}
|
}
|
||||||
#endif // !ALPHA_SCISSOR_USED
|
#endif // !ALPHA_SCISSOR_USED
|
||||||
|
|
|
||||||
|
|
@ -2242,7 +2242,7 @@ void fragment_shader(in SceneData scene_data) {
|
||||||
alpha = min(alpha, clamp(length(ambient_light), 0.0, 1.0));
|
alpha = min(alpha, clamp(length(ambient_light), 0.0, 1.0));
|
||||||
|
|
||||||
#if defined(ALPHA_SCISSOR_USED)
|
#if defined(ALPHA_SCISSOR_USED)
|
||||||
if (alpha < alpha_scissor) {
|
if (alpha < alpha_scissor_threshold) {
|
||||||
discard;
|
discard;
|
||||||
}
|
}
|
||||||
#endif // ALPHA_SCISSOR_USED
|
#endif // ALPHA_SCISSOR_USED
|
||||||
|
|
|
||||||
|
|
@ -1765,7 +1765,7 @@ void main() {
|
||||||
alpha = min(alpha, clamp(length(ambient_light), 0.0, 1.0));
|
alpha = min(alpha, clamp(length(ambient_light), 0.0, 1.0));
|
||||||
|
|
||||||
#if defined(ALPHA_SCISSOR_USED)
|
#if defined(ALPHA_SCISSOR_USED)
|
||||||
if (alpha < alpha_scissor) {
|
if (alpha < alpha_scissor_threshold) {
|
||||||
discard;
|
discard;
|
||||||
}
|
}
|
||||||
#endif // !ALPHA_SCISSOR_USED
|
#endif // !ALPHA_SCISSOR_USED
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue