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
524e5f06b7
SL-18001 Fix LLMaterialEditor::applyToSelection()
2022-09-22 20:15:38 +03:00
b2cf07f53c
WIP - switch PBR implementations
2022-09-17 01:12:52 -05:00
6afd635da4
SL-18125 Material asset creation pulls wrong set of permissions
2022-09-15 23:12:06 +03:00
5d918f98ea
SL-18161 Add PBR materials to Uploads in preferences
2022-09-15 00:29:54 +03:00
7229dfcc59
SL-17701: PBR: Add support for gltf Alpha MASK (cutoff)
2022-09-02 16:12:49 -07: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
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
8a91c13947
SL-17653 Local gltf materials #3
2022-08-23 00:23:16 +03:00
0d217dc73c
SL-17653 Local gltf materials #2
2022-08-23 00:23:05 +03:00
4bb419031c
SL-17653 Basic local gltf materials
2022-08-23 00:22:10 +03:00
e7f562e6d8
Fix for SL-17695 'Give materials and textures imported by Material Editor a sensible name' - compile error on mac/clang because it's more picky - as it should be in this case
2022-08-15 13:47:22 -07:00
a5bdc3c1f3
Merged in DRTVWR-559-SL-17695 (pull request #1089 )
...
SL-17695 Give materials and textures imported by Material Editor a sensible name - first pass - likely need to be refined but may be good enough for now
Approved-by: Andrey Kleshchev
Approved-by: Dave Parks
2022-08-10 21:32:00 +00:00
8645ffe172
SL-17695 Sensible names for material properties - sanitize the various names we use to store inventory items using a built in function
2022-08-10 12:52:14 -07:00
c989e202f2
SL-17695 minor cleanup pass to make the PR a bit easier to read
2022-08-09 10:38:33 -07:00
3b416b3e98
SL-17695 Give materials and textures imported by Material Editor a sensible name - first pass - likely need to be refined but may be good enough for now
2022-08-08 16:40:25 -07:00
e73fd2a2f2
SL-17653 Perially done restoration functionality
2022-08-09 00:22:09 +03:00
49278013ef
SL-17653 Apply selection to faces and linkset instead of just first object
2022-08-08 23:24:54 +03:00
eec96559d4
SL-17653 Fix live material preview not working
...
Material was immediately dropped due to not having an id.
This is a placeholder untill build floater gets a proper way to select materials.
2022-08-02 00:59:21 +03:00
206d8a0e31
SL-17690 Uploaded material asset references wrong texture UUIDs
...
Upload textures first, then get ids and upload material on callback
2022-07-20 18:50:14 +03:00
40a1154ec9
SL-17640 Check account balance before uploading
2022-07-19 19:56:16 +03:00
cfddc1b539
SL-17640 'Save As' should create a new item
...
Also fixed floater not using inventory item's name, some of the permissions
2022-07-06 18:39:50 +03:00
dd2bb26021
SL-17640 Handle unsaved changes better
2022-06-30 23:37:05 +03:00
68dfa1f550
SL-17640 Use LLAgentBenefitsMgr for upload cost
2022-06-30 21:03:21 +03:00
6f6df8ed71
SL-17685 Drag and drop material support
2022-06-29 21:42:44 -05:00
84bbe45fb5
SL-17602 WIP - Texture uploads form material editor now work but the names are garbage and the resulting material asset has the wrong UUIDs
2022-06-29 11:56:40 -05:00
57805cac68
SL-17379 More complete integration of material asset type
2022-06-28 15:15:57 -05:00
00a04b87a9
SL-17640 Fix name usage, fix "apply now"
...
This reverts commit 231c618a84
2022-06-27 22:30:14 +03:00
acdd77d4ce
Merge remote-tracking branch 'origin/DRTVWR-559' into brad/SL-17602-new-material-upload
2022-06-27 10:24:53 -07:00
fbb6eb216f
Initial pass at SL-17602 saving material to inventory from material editor floater.
2022-06-27 10:12:23 -07:00
231c618a84
SL-17653 Make changes in material editor apply to selection immediately and enable "apply now" checkbox in color swatches.
2022-06-27 09:59:11 -05:00
63daefb39a
SL-17640 Materials Upload UI #3
...
Fixed issues in button layout
Added 'unsaved changes' notification
2022-06-25 16:50:23 +03:00
34ee8eb277
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-06-24 11:13:54 -05:00
bce1e9a515
SL-17658 Make Material Importer strip alpha channels and repack occlusion as needed.
2022-06-24 11:13:41 -05:00
da1d9139b3
SL-17640 Materials Upload UI #2
...
New Fee fields
New Buttons
2022-06-24 08:36:50 +03:00
0bc7fee11f
SL-17640 Materials Upload UI #1
...
1. Allow 'none' textures
2. Disable 'apply now' buttons
3. Switch from loading dae files to just gltf glb
2022-06-24 08:36:50 +03:00
6ce3df5514
SL-17653 Flip imported GLTF textures, remove .dae and .glb/.gltf from file dialogs that don't support them
2022-06-23 18:06:55 -05:00
394479d7cc
SL-17653 WIP - Apply GLTF material in Material Editor to selected object when you click "Save"
2022-06-23 16:21:53 -05:00
18b0aa0371
SL-17619 Add support for embedded textures to GLTF importer
2022-06-16 16:16:53 -05:00
f5d66e79ee
SL-17605 WIP - Upload->Material now lets you pick a GLTF file and imports the first material in the GLTF file to the Material Editor
2022-06-15 17:03:38 -05:00
ad533fcd6b
SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons.
2022-06-14 23:39:11 -05:00
Andrey Kleshchev