diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2024-02-27 11:07:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-27 11:07:11 -0800 |
| commit | ae9d3e719a0cdb7af5dc470369df6fadd3e04b49 (patch) | |
| tree | 6f7bdf27cf2a42b424ad7e821ae963432a4a4f89 | |
| parent | 4ed5b59a601cfc58c3d5a5d4c1b56d4cdc73be2c (diff) | |
| parent | 95e1badaa4566bea41479623bf5b5112f7184cd5 (diff) | |
Merge branch 'release/materials_featurette' into geenz/mirrors-optimization-pass-1
| -rw-r--r-- | .github/ISSUE_TEMPLATE/10-bug.yaml (renamed from .github/ISSUE_TEMPLATE/bug.yaml) | 0 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE/20-enhancement.md (renamed from .github/ISSUE_TEMPLATE/enhancement.md) | 0 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE/30-blank.yaml | 10 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE/config.yml | 1 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl | 2 |
5 files changed, 12 insertions, 1 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/10-bug.yaml index 41208e8bf5..41208e8bf5 100644 --- a/.github/ISSUE_TEMPLATE/bug.yaml +++ b/.github/ISSUE_TEMPLATE/10-bug.yaml diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/20-enhancement.md index dd40478811..dd40478811 100644 --- a/.github/ISSUE_TEMPLATE/enhancement.md +++ b/.github/ISSUE_TEMPLATE/20-enhancement.md diff --git a/.github/ISSUE_TEMPLATE/30-blank.yaml b/.github/ISSUE_TEMPLATE/30-blank.yaml new file mode 100644 index 0000000000..abe2623378 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/30-blank.yaml @@ -0,0 +1,10 @@ +name: Blank Issue +description: Don’t see your issue here? Open a blank issue. +labels: [triage] +body: +- type: textarea + attributes: + label: Description + description: Please describe your issue. + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 75fa187132..f2d58f5f65 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,3 +1,4 @@ +blank_issues_enabled: false contact_links: - name: 💬 Community Feedback (Canny) url: https://feedback.secondlife.com diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl index a1da4b1f9a..8769cc0239 100644 --- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl +++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl @@ -98,7 +98,7 @@ void calcAtmosphericVars(vec3 inPositionEye, vec3 light_dir, float ambFactor, ou haze_glow = max(haze_glow, .001); // set a minimum "angle" (smaller glow.y allows tighter, brighter hotspot) haze_glow *= glow.x; // higher glow.x gives dimmer glow (because next step is 1 / "angle") - haze_glow = pow(haze_glow, glow.z); + haze_glow = clamp(pow(haze_glow, glow.z), -10, 10); // glow.z should be negative, so we're doing a sort of (1 / "angle") function // add "minimum anti-solar illumination" |