Commit Graph

16 Commits (d1e078a1229fa61ba697e382fb42b6a6b11e8f97)

Author SHA1 Message Date
Dave Parks 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
Dave Parks 57805cac68 SL-17379 More complete integration of material asset type 2022-06-28 15:15:57 -05:00
Andrey Kleshchev 00a04b87a9 SL-17640 Fix name usage, fix "apply now"
This reverts commit 231c618a84, instead color swatched get enabled 'apply now' in xml.
2022-06-27 22:30:14 +03:00
Brad Kittenbrink acdd77d4ce Merge remote-tracking branch 'origin/DRTVWR-559' into brad/SL-17602-new-material-upload 2022-06-27 10:24:53 -07:00
Brad Kittenbrink fbb6eb216f Initial pass at SL-17602 saving material to inventory from material editor floater. 2022-06-27 10:12:23 -07:00
Dave Parks 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
Andrey Kleshchev 63daefb39a SL-17640 Materials Upload UI #3
Fixed issues in button layout
Added 'unsaved changes' notification
2022-06-25 16:50:23 +03:00
Dave Parks 34ee8eb277 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-06-24 11:13:54 -05:00
Dave Parks bce1e9a515 SL-17658 Make Material Importer strip alpha channels and repack occlusion as needed. 2022-06-24 11:13:41 -05:00
Andrey Kleshchev da1d9139b3 SL-17640 Materials Upload UI #2
New Fee fields
New Buttons
2022-06-24 08:36:50 +03:00
Andrey Kleshchev 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
Dave Parks 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
Dave Parks 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
Dave Parks 18b0aa0371 SL-17619 Add support for embedded textures to GLTF importer 2022-06-16 16:16:53 -05:00
Dave Parks 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
Dave Parks ad533fcd6b SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons. 2022-06-14 23:39:11 -05:00