5e344813dc
SL-18396 PBR and blinn phong should not be allowed to be edited together
2023-07-27 23:26:46 +03:00
4b268a5d6a
Delete unprintable chars that accidentally got into the merge in kdiff3 for DRTVWR-559
2023-07-17 15:32:28 -07:00
f975cfd736
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-07-17 13:37:03 -07:00
ba4b596894
SL-19141 Fixed applying a no-copy texture to two objects failing silently
2023-07-11 01:24:22 +03:00
a256a18884
SL-19674 Disable "Blinn-Phong" when a PBR material is applied to make it clear that those buttons are inoperable until you remove the PBR material.
2023-05-15 13:49:20 -05:00
5721bdbc4d
SL-19399: Cleanup
2023-03-23 10:17:33 -07:00
1ba1159a36
SL-19399: Reorganize controls for PBR material editing in the build floater in more sensible way. Ignore "Lock repeat" in PBR mode as it's redundant
2023-03-22 17:08:13 -07:00
ad590887cc
SL-19399: Allow editing all PBR texture transforms at once with Complete material radio
2023-03-22 17:07:42 -07:00
0e837fbaad
Fix formatting in indra/newview/llpanelface.* files
2023-02-27 21:46:54 +01:00
0dd4efea93
Merge pull request #85 from secondlife/SL-19002
...
SL-19002: Handle edge case in client networking which could cause material ID and overrides to become out-of-sync
2023-02-14 14:45:53 -08:00
917932549f
SL-19002: Stop sending material IDs from client via material params and just call queueApply/queueModify
2023-02-14 13:59:00 -08:00
a549140fd0
SL-19183 PBR mapping scale values start on zero
2023-02-14 00:12:09 +02:00
a3f43b4b73
SL-19014 Sanitize the override data sent for faces without GLTF materials
2023-01-23 20:36:54 +02:00
693925ef23
SL-18820: Fix applying material clearing transform overrides. Loosen some asserts to allow non-default transform overrides.
2023-01-10 17:09:30 -08:00
3290f16f29
SL-18854 Fix drag'n drop of plain textures on faces in PBR mode
...
When in PBR 'mode', defaulted texture drops to diffuse channel
2023-01-04 13:31:27 +02:00
1d5332b232
SL-18448 When initing views and object has pbr, open pbr in texture tab
2022-12-02 14:24:25 +02:00
3812fb0f41
SL-18768 Disabled PBR texture transform when no PBR is set
2022-12-02 12:19:18 +02:00
51d5748d64
SL-18746: Disable transparency control in build floater when the prim has a GLTF material
2022-11-30 16:05:50 -08:00
bfcb07270e
SL-18732: Review feedback
2022-11-29 15:20:44 -08:00
f313a762fc
SL-18732: Fix texture transform controls not updating when switching which texture to edit
2022-11-29 13:26:04 -08:00
a989eba080
SL-18732: Fix flickering of control values when changing GLTF texture transforms in build floater
2022-11-29 13:26:04 -08:00
32984b56ea
SL-18701 llsd is not thread safe, parse it before using
2022-11-24 20:58:05 +02:00
ade79bc6f6
SL-18677 Disable materials UI when materials caps are not available
2022-11-18 21:15:54 +02:00
62aa0e807f
SL-18632: Un-hide planar align options when editing GLTF textures in build floater
2022-11-16 12:04:16 -08:00
fd76c195c8
SL-18632: Implement editing GLTF material texture transforms in build floater
2022-11-15 18:11:27 -08:00
5756a0284d
Merged in SL-18627 (pull request #1193 )
...
SL-18627: Make space for pbr transform controls in build floater and disable some WIP controls
Approved-by: Andrey Kleshchev
2022-11-14 21:31:08 +00:00
eab3d43e1b
SL-18627: Make space for pbr transform controls in build floater and disable some WIP controls
2022-11-11 12:43:20 -08:00
12a86f89e5
SL-18617 Disable fullbright checkbox and color swatch when GLTF material is present.
2022-11-10 14:16:34 -06:00
70b8e17f17
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-11-10 13:21:30 -06: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
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
dafbed80b4
SL-18583 Copy&Paste support for overrides
...
And a fix for SL-18583
2022-11-09 00:20:40 +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
a87505333e
SL-18448 Save material button in tools floater
2022-11-03 00:28:21 +02:00
89e9cdd482
SL-18531 Disable texture controls when editing face with material
2022-11-02 21:54:30 +02:00
757dc513db
SL-18448 Fix metallic and normal controls being swapped
2022-11-01 23:58:02 +02:00
b6a35e36d7
SL-18448 Material Editor and Tools floater adjustments
...
1. Enable glow
2. Added buttons to texture->pbr
2022-10-29 02:52:56 +03:00
6d0fcc0e61
SL-17699 Blank material Id for material picker
2022-10-28 20:08:53 +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
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
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
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
baf1f0f14d
SL-18346 Fix a typo
2022-10-13 00:01:23 +03:00
17f421fb2e
SL-18346 Fixed tools floater not editing pbr texture offsets correctly
2022-10-12 22:51:26 +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
94b9286858
SL-17999 'copy' functionality for 'features' and 'texture' tabs
...
And a fix to prevent message spam
2022-09-22 11:06:41 +03:00
Andrey Kleshchev