b877e80d70
SL-20464 Don't allow enetring non-unicode material name
2023-10-13 20:08:02 +03:00
5566f28b03
D559 Post merge fixes
2023-10-03 20:13:23 +03:00
1b493d5690
SL-20343 Material floater was disconnected from object's face
2023-09-28 03:55:43 +03:00
52d973e955
Merge pull request #361 from secondlife/SL-20167
...
SL-20167: Grey out the clipboard when copying the material is not allowed
2023-09-06 15:13:11 -07:00
c0bcc3740e
SL-20167: Don't block clipboard if GLTF material is null
2023-09-06 11:47:34 -07:00
acc7f6a271
SL-18125 Fixed default upload permissions being ignored
2023-09-05 19:50:26 +03:00
05c8ef3f3c
SL-20167: Grey out the clipboard when copying the material to clipboard is not allowed
2023-09-01 17:36:00 -07:00
a388c5494e
SL-20024: Fix unable to modify a no-copy material from the build floater
2023-08-18 16:33:26 -07:00
466914e122
SL-20024: Double-check object inventory is not pending when save button pressed
2023-08-11 17:18:06 -07:00
076a02e2d8
SL-20024: Strike a better balance with saved material permissions handling, w/r/t author intent and being easier to understand
2023-08-11 16:31:02 -07:00
57cc252fd6
SL-20024: Miscellaneous cleanup
2023-08-11 16:31:02 -07:00
76c8cca936
SL-20024: Fix author attributions not transferring for saved object materials, fix item not renamed
2023-08-11 16:31:01 -07:00
a5d318567c
SL-20024: (WIP) (untested) Fix GLTF material permissions in some more edge cases
2023-08-11 16:31:00 -07:00
7bf6103ad9
SL-20024: (WIP) (not tested) Improved behavior for saving material to inventory. Check perms, keep perms.
2023-08-11 16:31:00 -07:00
ca6f465088
SL-20024: Disable material editor on prim when contained material is no mod
2023-08-11 16:30:59 -07:00
df1eb38b21
SL-19999 stop outputing debug info about created material asset id unnecessarily
2023-07-13 10:18:54 -07:00
b30cde2a05
SL-19392 Disable "Double Sided" by default when importing double sided materials
2023-03-21 21:31:18 +02:00
b9b913a60a
SL-19349 Fix for hang on bulk upload of materials, add bulk upload option to material selector, incidental decruft.
2023-03-07 09:38:43 -06:00
17d3f37863
SL-17640 Fix 'Apply now' being enabled when importing
2023-02-16 22:51:29 +02:00
ba7a333969
Merge pull request #73 from secondlife/SL-19080
...
SL-19080: GLTF Material asset consistency: Part 2: Update viewer GLTF Material asset upload to v1.1
2023-02-14 11:40:32 -08:00
d6841c0798
SL-19080: Update GLTF Material asset upload to v1.1, with stricter GLTF compliance and removal of unsupported features
2023-02-09 15:05:19 -08:00
dc1dd7a274
Fix some unused variable warnings in DRTVWR-559
2023-02-02 12:26:59 -08:00
503e18fc64
SL-19005 Fix 'save as' button for local uploads
2023-01-27 17:22:57 +02:00
a3f43b4b73
SL-19014 Sanitize the override data sent for faces without GLTF materials
2023-01-23 20:36:54 +02:00
7c853be544
SL-19005 Fix save button for local uploads
2023-01-23 18:50:07 +02:00
10a4319c30
SL-18962 PBR Materials should be viewable even if they are no-copy
2023-01-12 19:03:36 +02:00
3e1afc3c91
SL-18947 No modify materials can lock material floater
...
Not supposed to happen, yet somehow did
2023-01-11 23:56:41 +02:00
76c6f3f002
SL-18741 Don't allow bulk upload without caps
2022-12-07 21:21:03 +02:00
c69c8aa347
SL-18777 PBR upload was stuck waiting for texture
...
Handle obscure upload failure case - floater was waiting for a texture upload indefinetely.
Unblock floater if upload fails.
2022-12-07 02:16:12 +02:00
c033278ec2
SL-18795 Overrides are not applied to one face
2022-12-07 01:32:01 +02:00
321c7895d0
SL-18741 Basic bulk upload for gltf materials #1
2022-12-02 10:24:23 +02:00
c0f598c103
SL-18725 Texture picker should explain why dropping texture isn't allowed
...
Show a tooltip on drag&drop
2022-12-01 21:43:20 +02:00
7c489e0480
SL-18648 Clean up unused mNonImmediateFilterPermMask
2022-12-01 05:33:48 +02:00
c99c24939a
Merge pull request #16 from secondlife/SL-18732
...
Sl 18732: Fix responsiveness of GLTF texture transform controls in build floater
2022-11-30 09:27:22 -08:00
bfcb07270e
SL-18732: Review feedback
2022-11-29 15:20:44 -08:00
361571cdb3
SL-18732: Use override update callback for LLMaterialEditor::updateLive as well
2022-11-29 13:51:23 -08:00
9f7967fcdc
SL-18727 Save material to Inventoryshould prioritize picked face
2022-11-29 23:36:37 +02:00
32984b56ea
SL-18701 llsd is not thread safe, parse it before using
2022-11-24 20:58:05 +02:00
6387fbb378
SL-18648 Simplify permission testing
2022-11-16 23:56:06 +02:00
bfe5e3f289
SL-18648 Material editor should only allow full-perm textures
2022-11-16 23:23:43 +02:00
76de36c405
SL-18602 Integrate queueModify/queueApply/queueUpdate into all the places that used to post to ModifyMaterialParams directly.
2022-11-10 13:21:06 -06:00
d68f379786
SL-18583 Fixed incorrect values being applied when returning to a case without override
2022-11-10 17:47:48 +02:00
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
332ddc67de
SL-17653 Small change in material loading order
2022-09-29 23:17:49 +03:00
9346b45188
SL-17653 Multi-material file support for local materials
2022-09-29 22:39:32 +03:00
411aa9f727
SL-18190 Fix for haze color being completely wrong (now it's just half wrong).
2022-09-29 00:19:52 -05:00
144fb0c315
SL-18233 Fixed editor not udpating after saving material from task inventory
2022-09-28 20:18:21 +03:00
6b46793771
SL-18233 Double clicking material in an object shows notecard
2022-09-28 20:01:06 +03:00
3e59ae1c43
SL-17640 Support loading materials from multi-material files
2022-09-27 17:59:40 +03:00
30b6d29b04
SL-17640 Material editor permissions support
2022-09-26 23:23:52 +03:00
8f1d226865
SL-18134 Rename Albedo to Base Color to be more consistent with GLTF spec
2022-09-23 11:19:56 -05:00
Maxim Nikolenko