0ecc677b49
SL-18583 Missed flushUpdates
2022-11-10 18:30:41 +02:00
d68f379786
SL-18583 Fixed incorrect values being applied when returning to a case without override
2022-11-10 17:47:48 +02:00
34a8cb75bb
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
...
# Conflicts:
# indra/newview/llgltfmateriallist.h
2022-11-09 17:13:16 -06:00
1ed8f7cd0c
SL-18602 Fix for applying material asset not removing overrides on drag-and-drop
2022-11-09 17:10:31 -06:00
a83a4811b5
SL-18518 Move json to material work to background thread
2022-11-09 22:52:30 +02:00
14d901f25f
SL-18583 Use gltf overrides as a base for live editing to send only minimal changes
2022-11-09 03:12:14 +02:00
4d961ccbaa
Merged in revert-pr-1190 (pull request #1191 )
...
Revert "SL-18523: When editing an object's material override, use the object's material override as a base, rather than its render material (pull request #1190 )"
2022-11-09 00:17:22 +00:00
4aaa484195
Revert "SL-18523: When editing an object's material override, use the object's material override as a base, rather than its render material (pull request #1190 )"
2022-11-09 00:16:41 +00:00
ded67322de
Merged in SL-18523 (pull request #1190 )
...
SL-18523: When editing an object's material override, use the object's material override as a base, rather than its render material
2022-11-09 00:03:34 +00:00
dafbed80b4
SL-18583 Copy&Paste support for overrides
...
And a fix for SL-18583
2022-11-09 00:20:40 +02:00
cba87c62cc
SL-18523: When editing an object's material override, use the object's material override as a base, rather than its render material
2022-11-08 11:55:45 -08:00
d72824c2b7
SL-18197 Bump inventory cache version
...
Issue: release viewer saves materials as AT_UNKNOWN (255). When material viewer loads cache with materials saved as '255' instead of '57', material viewer doesn't know to update content and it casuses issues. Viewer eventally recovers, but it's simpler to drop cache in this case over trying to figure out if our unknown is a material (but may be cache should include asset type count to let viewer know when to double check unknowns).
Also made 'legacy' materials folder's name localizable just in case.
2022-11-08 21:19:13 +02:00
ee6e34c099
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-11-08 12:23:08 -06:00
40d01ba393
SL-18585 Batch updates to ModifyMaterialParams capability.
2022-11-08 12:20:59 -06:00
080421decb
SL-18583 Make Live Material editor restore changes when canceling in texture or color pickers
2022-11-08 01:22:08 +02:00
2b1ff7495d
SL-18583 Make tools floater restore overrides when canceling changes #1
...
This works only partially since changes from material editor are not yet tracked.
2022-11-07 18:07:09 +02:00
c1180f1cc7
SL-18583 Fix race condition when setting multiple faces
...
And fix cases of updates not applying
2022-11-07 18:07:09 +02:00
172366121a
SL-18560 Mac build fix
2022-11-04 19:35:16 +02:00
11c87378be
SL-18560 Make local materials save correctly from right-click menu
2022-11-04 18:57:48 +02:00
d26f545c5a
SL-18391 Fixed local materials failing to load
2022-11-03 19:57:21 +02:00
a0c7a7ecdc
SL-18548 fix for crash when trying to Save material without caps
2022-11-03 15:17:09 +02:00
0f20cf17fd
SL-18446 Don't cause excessive udpates #2
2022-11-03 01:36:45 +02:00
a87505333e
SL-18448 Save material button in tools floater
2022-11-03 00:28:21 +02:00
81011a318e
Merged in SL-18485 (pull request #1183 )
...
SL-18485: Render GLTF materials with extension KHR_texture_transform with approprate texture transforms
2022-11-02 20:10:04 +00:00
106b1a6e6a
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-11-02 14:58:45 -05:00
3e7e146be6
SL-18520 Fix for mac build.
2022-11-02 14:58:24 -05:00
9e7b725c15
SL-18485: Render GLTF materials with extension KHR_texture_transform with approprate texture transforms
2022-11-02 12:55:18 -07:00
89e9cdd482
SL-18531 Disable texture controls when editing face with material
2022-11-02 21:54:30 +02:00
d042ad67ed
SL-18448 Make material editor's scroll smarter
2022-11-02 19:47:47 +02:00
32cc9a71d0
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-11-02 12:17:28 -05:00
c3f94ab9a1
SL-18520 Use GLTF material.extras to pass flags for enabling overriding alpha mode and double sided to default
2022-11-02 12:14:56 -05:00
734e3fcb21
SL-18522 Use naming consistent with GLTF standard
2022-11-02 01:08:43 +02:00
757dc513db
SL-18448 Fix metallic and normal controls being swapped
2022-11-01 23:58:02 +02:00
245cfb30f6
Merge remote-tracking branch 'origin/master' into DRTVWR-559
2022-11-01 14:19:57 -07:00
15b5dedb2d
Increment viewer version to 6.6.8
...
following promotion of DRTVWR-575
2022-11-01 17:16:13 -04:00
613f3738b2
D559 MacOS build fix
2022-11-01 23:05:03 +02:00
d228a12f45
SL-18448 Fixed exit condition
2022-11-01 22:23:45 +02:00
8c5c07d307
SL-18448 Modified Material Editor to match overrides better
2022-11-01 22:20:38 +02:00
0ea5b38b8d
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-11-01 15:17:42 -05:00
a4ad75e93c
SL-18520 WIP - Use off-by-epsilon and special UUID identifier hacks to allow overriding to default values.
2022-11-01 15:17:22 -05:00
a0e7dd45d9
Fix mac build for DRTVWR-559. PROFILE_ZONE_SCOPED macro cant take an argument
2022-11-01 10:15:37 -07:00
e6fb0a9397
SL-18391 Removed direct dependency of local materials onto tinygltf
2022-11-01 18:51:47 +02:00
9f21fba6d9
SL-18513 Put profile markers around GLTF code.
2022-11-01 08:31:01 -05:00
8faa5a3305
SL-18448 Fix for mac build.
2022-10-31 17:39:56 -05:00
52b64bcfd7
Fix SL-18511 TOS and MFA login failure handlers must cooperate to answer both reasons at the same time
2022-10-31 14:17:05 -07:00
e73c5e4ee3
SL-18448 Do not show editor when saving material inworld, only a name prompt
2022-10-31 23:16:37 +02:00
75e743be2f
SL-18442 Port of Caladbolg's fix for emissive overrides not taking. Remove unused function.
2022-10-31 15:58:20 -05:00
94afae5b15
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-10-31 15:20:02 -05:00
29e344bbd0
SL-18483 Work around for crash on AMD when using glGenerateMipmap on cubemap array.
2022-10-31 15:19:28 -05:00
4cb5439e42
SL-18446 Don't cause excessive udpates
2022-10-31 21:24:41 +02:00
Andrey Kleshchev