1ed8f7cd0c
SL-18602 Fix for applying material asset not removing overrides on drag-and-drop
2022-11-09 17:10:31 -06: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
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
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
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
11c87378be
SL-18560 Make local materials save correctly from right-click menu
2022-11-04 18:57:48 +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
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
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
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
8faa5a3305
SL-18448 Fix for mac build.
2022-10-31 17:39:56 -05:00
e73c5e4ee3
SL-18448 Do not show editor when saving material inworld, only a name prompt
2022-10-31 23:16:37 +02:00
4cb5439e42
SL-18446 Don't cause excessive udpates
2022-10-31 21:24:41 +02:00
094a8876d6
SL-18446 Material override arrival filtering
2022-10-31 20:12:53 +02:00
35d4124b5e
SL-18446 Material override arrival for selected objects should update material editor
2022-10-29 03:16:16 +03:00
6d0fcc0e61
SL-17699 Blank material Id for material picker
2022-10-28 20:08:53 +03:00
467c9f627c
SL-18441 Fix logging to be more informative and logcontrol compatible.
2022-10-28 18:45:36 +03:00
29062fd907
SL-18441 "Override" UI cleanup
2022-10-27 23:35:46 +03:00
e70cf8edfe
SL-18446 Live editing material should not override objects without pbr
...
Objects without pbr have no base to override
2022-10-27 23:35:46 +03:00
0c0b66388f
SL-18465 Crash opening Material Editor
2022-10-27 01:46:31 +03:00
65eec2ca8f
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-10-26 17:22:50 -05:00
8f47657d64
SL-18443 Allow nulling out of override data and implement new override message protocol.
2022-10-26 16:08:28 -05:00
5ee774f4ec
SL-18446 Support "multiple textures" in Live material overrides
2022-10-26 22:40:30 +03:00
d69c814db9
SL-18446 Terse-update selection set from live material editor #1
2022-10-26 20:55:49 +03:00
89625f9247
SL-18444 Live Material Editor updating with selection
2022-10-26 00:41:59 +03:00
4a1397c621
SL-18414 Smarter material editor's cancel for overrides
2022-10-24 23:35:28 +03:00
88659e9fe7
SL-18105 When saving an object's material to inventory, save the version that as overrides applied.
2022-10-22 15:25:03 -05:00
7135934e50
SL-18105 Fix for crash when attempting to "Edit PBR Material" when there's no PBR material
2022-10-22 11:01:35 -05:00
0cd7c38421
SL-18105 Hook up live material editor to current selection set and implicitly open build floater when editing a PBR material.
2022-10-21 18:05:19 -05:00
61967623ba
SL-18105 Clean up class1/deferred/materialF.glsl (merge cleanup), make override messaging LLSD where it ought to be and JSON where it ought to be.
2022-10-21 16:34:14 -05:00
5847218069
SL-18391 Basic GLTF lifetime management
2022-10-19 01:01:03 +03:00
0b177c27a0
SL-18008 Mac build fix
2022-10-18 22:08:27 +03:00
7be33594ea
SL-18008 Updated Save and Edit PBR buttons
2022-10-18 20:13:08 +03:00
f20c47a596
More work on SL-17697 LLMaterialEditor now uses new override diffing code when applyToSelection() gets called
2022-10-17 16:51:45 -07:00
53e5216b20
Continuing work on SL-17697 Live editing with material overrides.
...
* Fixed Selection usage so material editor no longer hardcoded to a single object/face
* made local preview hack the fallback for when the ModifyMaterialParams cap is missing
2022-10-17 15:48:49 -07:00
77eba62335
SL-18008 Placeholder functionality for PBR Edit button
2022-10-17 23:55:59 +03:00
a27e701530
SL-18008 Add Save and Edit buttons to right click menu for materials
2022-10-17 23:33:27 +03:00
c6bb0fef90
Fix SL-17697 local_id usage
2022-10-14 14:44:05 -07:00
bda4206627
WIP for SL-18103 and SL-17697 live editing of materials using ModifyMaterialParams cap
2022-10-14 14:44:05 -07:00
3d170fae5d
SL-18125 Separate GLTF permissions from normal uploads
2022-10-13 21:02:02 +03:00
3514ab73bd
SL-18125 Material asset doesn't inherit some "uploads" permissions
2022-10-12 11:50:59 +03:00
2fa8bce1cf
SL-18326 GLTF material functionality in a Notecard
2022-10-08 01:14:22 +03:00
1a437cbedf
SL-18144 Bakes On Mesh not showing in-world as Albedo
2022-10-04 20:33:10 +03:00
Dave Parks