Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for mirrors not functioning properly under water. #1436

Merged
merged 18 commits into from
May 8, 2024
Merged

Fix for mirrors not functioning properly under water. #1436

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c2730b4
https://github.com/secondlife/viewer/issues/1286 - determine viewer_c…
vir-linden Apr 19, 2024
f39987f
https://github.com/secondlife/viewer/issues/1286 - branch var from gi…
vir-linden Apr 19, 2024
a65de93
https://github.com/secondlife/viewer/issues/1286 - branch var from gi…
vir-linden Apr 19, 2024
6ca4dfd
Update build.yaml
vir-linden Apr 19, 2024
a3602d6
Merge pull request #1323 from secondlife/main
vir-linden Apr 24, 2024
f886a43
Adapt llimageworker_test for updated virtual method API.
nat-goodspeed Apr 25, 2024
ab85470
Merge branch 'main' into project/channel_by_branch
vir-linden May 1, 2024
65495ba
set viewer channel from branch
vir-linden May 1, 2024
7f23f16
trim trailing whitespace
vir-linden May 1, 2024
4329e95
Turn on LL_TESTS for CI builds.
nat-goodspeed May 2, 2024
eb0f963
Update build.yaml
vir-linden May 2, 2024
6eeef10
Update build.yaml
vir-linden May 2, 2024
079c6ab
Merge pull request #1376 from secondlife/project/channel_by_branch
vir-linden May 2, 2024
8d53725
Update LLGLTFMaterial tests for changes introduced in SL-20523
brad-linden May 2, 2024
2c1647e
Merge pull request #1389 from secondlife/brad/fix-gltfmaterial-tests
nat-goodspeed May 2, 2024
10aa7f4
Merge pull request #1391 from secondlife/with-tests
nat-goodspeed May 2, 2024
a2a4d70
#1165 Fix for clipping and culling for mirrors under water.
Geenz May 8, 2024
e4d6f22
Merge branch 'main' into geenz/fix/1165
Geenz May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion indra/newview/pipeline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2269,7 +2269,8 @@ static LLTrace::BlockTimerStatHandle FTM_CULL("Object Culling");
// static
bool LLPipeline::isWaterClip()
{
return (!sRenderTransparentWater || gCubeSnapshot) && !sRenderingHUDs;
// We always pretend that we're not clipping water when rendering mirrors.
return (gPipeline.mHeroProbeManager.isMirrorPass()) ? false : (!sRenderTransparentWater || gCubeSnapshot) && !sRenderingHUDs;
}

void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result)
Expand Down
Loading