summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2024-06-04 17:55:38 -0700
committerBrad Linden <brad@lindenlab.com>2024-06-04 17:55:38 -0700
commitf4808dbbe1ee7066df5e46ef2fb57aa5353071a1 (patch)
treec3f41839b92fb1c0dc882a48b90624881dd9d6f4 /indra/newview
parent7889df945b0d6bb23f864ba8d1ede16f67a27c8e (diff)
Fixup mix->pbr_mix after merge.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
index c4c1fc6952..abb899a876 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
@@ -233,7 +233,7 @@ void main()
#if (TERRAIN_PBR_DETAIL >= TERRAIN_PBR_DETAIL_NORMAL)
mix2.vNt = mikktspace(mix2.vNt, vary_tangents[0]);
#endif
- pbr_mix = mix_pbr(mix, mix2, tm.weight.x);
+ pbr_mix = mix_pbr(pbr_mix, mix2, tm.weight.x);
break;
default:
break;
@@ -275,7 +275,7 @@ void main()
#if (TERRAIN_PBR_DETAIL >= TERRAIN_PBR_DETAIL_NORMAL)
mix2.vNt = mikktspace(mix2.vNt, vary_tangents[1]);
#endif
- pbr_mix = mix_pbr(mix, mix2, tm.weight.y);
+ pbr_mix = mix_pbr(pbr_mix, mix2, tm.weight.y);
break;
default:
break;
@@ -317,7 +317,7 @@ void main()
#if (TERRAIN_PBR_DETAIL >= TERRAIN_PBR_DETAIL_NORMAL)
mix2.vNt = mikktspace(mix2.vNt, vary_tangents[2]);
#endif
- pbr_mix = mix_pbr(mix, mix2, tm.weight.z);
+ pbr_mix = mix_pbr(pbr_mix, mix2, tm.weight.z);
break;
default:
break;
@@ -359,7 +359,7 @@ void main()
#if (TERRAIN_PBR_DETAIL >= TERRAIN_PBR_DETAIL_NORMAL)
mix2.vNt = mikktspace(mix2.vNt, vary_tangents[3]);
#endif
- pbr_mix = mix_pbr(mix, mix2, tm.weight.w);
+ pbr_mix = mix_pbr(pbr_mix, mix2, tm.weight.w);
break;
default:
break;