d7eeaf42ce
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2022-09-03 13:53:07 +02:00
a3dff0db26
DRTVWR-559: PBR: Cleanup
2022-09-02 17:03:14 -07:00
235d2f4535
DRTVWR-559: PBR: Maintain slightly higher quality of normals from normal map
2022-09-02 17:02:58 -07:00
dfaadd5db0
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
2022-09-02 16:13:04 -07:00
7229dfcc59
SL-17701: PBR: Add support for gltf Alpha MASK (cutoff)
2022-09-02 16:12:49 -07:00
852d552ca2
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-09-02 19:56:35 +01:00
bded34a861
SL-17999 PBR should reuse texture possition channels from normal materials
2022-09-02 21:22:08 +03:00
01cf98cec9
SL-18039 Added scroll into material editor
2022-09-02 21:22:07 +03:00
7bb5315847
DRTVWR-559: PBR: Show sun in specular spotlight relfection
2022-09-02 09:53:02 -07:00
44f1aed84c
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
2022-09-02 00:00:58 -07:00
d9d33c1597
SL-18082: PBR: Fix spotlight color and seam
2022-09-02 00:00:30 -07:00
e15982eb55
Merged in rye-refprobefixes (pull request #1119 )
...
Use an SRGB buffer for initial reflection map capture for proper linear sampling
2022-09-01 23:13:14 +00:00
e0c226b04d
SL-18078, SL-18065 -- Experimentally allow uploading of lossless normal maps, fix for crash on shutdown.
2022-09-01 18:06:15 -05:00
ef98be881c
Use an SRGB buffer for initial reflection map capture for proper linear sampling
...
Fix irradiance gen up vector to be properly normalized
2022-09-01 17:30:48 -04:00
3c3442cbbc
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-09-01 15:12:14 +01:00
2c692f635d
DRTVWR-559 refcount max change
2022-09-01 15:11:56 +01:00
d2d257cfa9
SL-17653 Fix combo not being visible when needed
2022-09-01 16:05:01 +03:00
116bd660b6
SL-17653 Finalized texure picker's local filtering
2022-09-01 13:26:11 +03:00
20dc30450c
SL-17999 PBR material in tool's texture tab
2022-09-01 13:26:10 +03:00
8df1856f84
SL-17653 In texture picker cleaned up permanently invisible 'show folders' checkbox
2022-09-01 13:26:10 +03:00
ce685a12b9
DRTVWR-559: PBR: Cleanup distance attenuation calcs
2022-08-31 21:06:41 -07:00
539fd5fcf9
SL-17975: PBR: Don't process point light if outside light radius
2022-08-31 21:04:45 -07:00
17a957fe44
DRTVWR-559: PBR: Cleanup: Don't do redundant dot(n,l) calc
2022-08-31 21:00:58 -07:00
f4d7b11e16
SL-17975: PBR: Fix point light popping
2022-08-31 20:59:43 -07:00
eff9f08bd9
DRTVWR-559: PBR: Disable PBR bloom
2022-08-31 13:19:56 -07:00
71115a7a27
SL-17703: Fix merge
2022-08-31 10:16:24 -07:00
5c0e201cd6
SL-18065 WIP -- Clamp virtual size of fetched textures.
2022-08-31 11:45:48 -05:00
c9f893b100
SL-18065 WIP -- Adjust max virtual size to keep debug floater readable. Make assert on shutdown less frequent (still not gone, likely race condition). Fix unrelated assertion in reflection probes.
2022-08-31 11:36:00 -05:00
0833bbb44c
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-08-31 09:07:36 +02:00
cefc6c4afc
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllocalbitmaps.h
# indra/newview/llviewerregion.cpp
2022-08-31 09:03:56 +02:00
8eaee1f033
SL-17703: PBR: Fix albedo being in wrong color space, add support for debug default_irradiance.png
2022-08-30 20:35:15 -07:00
e8002dc00f
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-08-30 16:43:20 -05:00
47ecbca24d
SL-17987 Fix for material editor not initializing to GLTF defaults when loading a null material asset.
2022-08-30 16:43:05 -05:00
d19d827121
Merge branch master (DRTVWR-483) into DRTVWR-559
...
# Conflicts:
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllocalbitmaps.h
# indra/newview/llviewerregion.cpp
# lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-31 00:30:49 +03:00
4562d0bfc5
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-08-30 23:20:29 +02:00
18341f0d76
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-30 23:19:12 +02:00
fbccc0986d
SL-17653 Clean up unneeded filepicker dependency.
2022-08-31 00:18:51 +03:00
d31a83fb94
Increment viewer version to 6.6.4
...
following promotion of DRTVWR-483
2022-08-30 17:02:51 -04:00
2158162b50
SL-18055 Fix for soft cube maps on chrome (don't clamp roughness value)
2022-08-30 15:46:38 -05:00
8333c7347d
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2022-08-30 22:20:08 +02:00
3f145c0c3f
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-563
...
# Conflicts:
# indra/llcommon/llframetimer.cpp
# indra/llcommon/llprofiler.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
2022-08-30 22:17:59 +02:00
5e3452656c
Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer
2022-08-30 21:57:11 +02:00
5828659a4f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-30 21:56:48 +02:00
03d012d46c
SL-18038 Remove placeholder "save as material" button
2022-08-30 14:42:04 -05:00
e928e3fec4
SL-17705 AMD compatibility -- use a specific LoD of irradiance map to avoid black outlines on AMD
2022-08-30 13:57:46 -05:00
197ac7cc20
Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559
2022-08-30 10:46:36 -05:00
14af7cabdb
SL-17997 Fix for crash on shutdown
2022-08-30 10:32:09 -05:00
04abd81b53
Update German translation
2022-08-30 11:29:32 +02:00
b0f88bef63
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-08-30 11:25:02 +02:00
29cf23c852
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-30 09:43:24 +02:00
Ansariel