fef4f9a07e
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llavatarappearance.h
# indra/llcharacter/llcharacter.cpp
# indra/llcharacter/llcharacter.h
# indra/llcharacter/lljoint.cpp
# indra/llcharacter/lljoint.h
# indra/llimage/llimagedimensionsinfo.cpp
# indra/llprimitive/lldaeloader.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelprofilepicks.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvoavatarself.h
# indra/newview/llwatchdog.cpp
# indra/newview/llwatchdog.h
2025-05-03 15:45:54 +02:00
3f6102bc06
Hide and restore GLTF material depending if on the BP or PBR tab to fix visual issues.
2025-04-18 20:25:25 +10:00
bc325fd0de
Correctly save the gltf materials so they can be reverted on cancel in the fs texture panel
2025-04-18 00:10:28 +10:00
9ed74960bd
Fix cancelling PBR texture and colour changes on FS texture panel not reverting
2025-04-18 00:09:37 +10:00
25ca098dc9
Fix GLTF nuking while using LL texture panel
2025-04-18 00:03:23 +10:00
7967e7465c
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-04-15 17:36:45 +02:00
70680d9442
All PBR and Blinn-Phong's normal and specular now scale correctly when using RPM on more than 1 face, such as the whole object.
2025-04-03 02:32:31 +10:00
1ec05da4aa
Fixed incorrect rpm scaling due to getting the wrong scale t value.
2025-04-02 18:13:28 +10:00
0f2cdbd849
Fixed PBR rpm slider not updating properly when focused
2025-04-02 07:04:39 +10:00
5b42942062
Fixed rpm on PBR not working on non 1:1 scaled objects.
2025-04-02 00:08:04 +10:00
a14d0048a5
Added missing spinner focuses for PBR to improve sync.
2025-04-01 09:37:57 +10:00
f3c1b68fe6
Fixed issue when channel tab is being selected in code
2025-04-01 09:21:51 +10:00
40365b72b4
Made certain maps static so they aren't constantly recreated
2025-04-01 07:45:09 +10:00
53fa5a0881
Focus spinners when they are interacted with to improve UI sync.
2025-04-01 07:43:23 +10:00
adfa45f7a6
Force texture panel UI update when switching mat tab or channel tab to fix desync.
2025-04-01 07:42:39 +10:00
438ce4e445
Implemented repeats per meter for PBR
2025-04-01 06:55:04 +10:00
54a991a54c
Add water exclusion checkbox to new texture/materials panel
2025-03-09 00:18:42 +01:00
fdbb976021
FIRE-35138] Fix the over-zealous tab switching when editing materials
...
Thsi actually just disbales the viewer trying to guess what the user intends. Feedback on FIRE-35138 in regards other issues would be useful
2025-02-08 22:13:09 +00:00
8b154ad95e
FIRE-34749 - editing PBR objects turns them all white
...
Technically what appears to be happening is that the renderer is identifying the object as wnating to show the BP textures because the BP tab was selected.
This fix tries to correctly select the BP tab by default only when no PBR faces are present. It also triggers a rebuild of the selected objects to force them updated draw because the selection even occurs before the tab change and they would otherwise by displayed using whatever the previous mode was.
2025-02-03 21:21:29 +00:00
7f790bbc77
Update FS texture edit panel to include the latest LL changes and a few other internal changes.
2024-08-09 04:38:33 +02:00
088cc2ea35
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llpointer.h
# indra/llcommon/llqueuedthread.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llstatgraph.cpp
# indra/llui/llvirtualtrackball.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaceprofile.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvocache.cpp
# indra/newview/llworldmapview.cpp
2024-07-09 02:25:42 +02:00
20294e9ee8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
2024-07-02 01:23:35 +02:00
a2dcb234a6
Fix media panel getting disabled when the face has a pbr material applied. This was a misplaced leftover from converting the LL texture panel to the new layout.
2024-07-01 15:46:40 +02:00
0acb56649b
Fix for all the texture panel bugs showing up in log
2024-06-30 00:47:19 +02:00
45ab5c68ee
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llrender/llgl.h
# indra/newview/fspanelface.cpp
# indra/newview/fspanelface.h
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llheroprobemanager.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewercamera.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvocache.cpp
# indra/newview/vjlocalmesh.cpp
2024-06-21 19:58:00 +02:00
a7c260f7a9
Housekeeping: learn how to correctly spell applying as well
2024-06-16 21:17:48 +02:00
56a7bb28da
Housekeeping: learn how to spell apply
2024-06-16 19:56:07 +02:00
515c06113d
Fix another case of BP channel mixup when using drag and drop
2024-06-16 19:52:44 +02:00
e9a45d709c
A bit of cleanup, whitespace and debugging log
2024-06-15 00:51:10 +02:00
cc4c414873
FIRE-33856 - fix cancel button for BP diffuse textures
2024-06-14 17:59:05 +02:00
2d0c807daf
Fix BP texture picker applying texture to the wrong material channel when different transforms tab is open
2024-06-14 17:26:28 +02:00
c27cf95b91
Pass pointers to the actual texture controls instead of their names, remove unused parameters
2024-06-14 17:15:59 +02:00
ea5ead6f4a
Merge remote-tracking branch 'FS600/master'
...
# Conflicts:
# doc/contributions.txt
# indra/llimage/tests/llimageworker_test.cpp
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
2024-05-23 18:15:07 +02:00
0ecfbc3de9
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
2024-05-16 14:10:55 +02:00
343aeeeb36
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# doc/contributions.txt
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
2024-05-16 02:11:51 +02:00
570810074d
Merge remote-tracking branch 'LGPL/master'
2024-05-13 17:39:18 +02:00
508ab2df1c
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llimage/llimage.h
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llshadermgr.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-05-10 12:40:19 +02:00
928c3f1e86
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llprimitive/llgltfmaterial.h
# indra/newview/llgltfmateriallist.cpp
# indra/newview/llviewerregion.h
# indra/newview/llvocache.cpp
2024-05-10 11:27:52 +02:00
269d904631
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llimage/tests/llimageworker_test.cpp
# indra/llprimitive/llgltfmaterial.h
2024-05-08 20:25:58 +02:00
46ba16846d
fix RelWithDebInfo build error
...
E:\cabbage\sl\phoenix-firestorm\indra\newview\fspanelface.cpp(1152,3): error C2065: 'comboTexGen': undeclared identifie
r [E:\cabbage\sl\phoenix-firestorm\build-vc170-64\newview\firestorm-bin.vcxproj]
2024-05-05 11:46:25 -07:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
4a2790a987
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/app_settings/graphic_preset_controls.xml
2024-04-24 21:10:15 +02:00
7a2070d795
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llscrollingpanelparam.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llvovolume.cpp
2024-04-24 18:59:46 +02:00
3b902c9f36
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/fix-incredibuild.py
# indra/newview/CMakeLists.txt
# indra/newview/llagentbenefits.cpp
# indra/newview/llgltfmateriallist.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llvocache.cpp
# indra/newview/llvocache.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/viewer_manifest.py
2024-04-17 10:57:12 +02:00
af24e0a5a5
new texture panel: restore Find All function as a popup icon on the blinn-phong texture map pickers and the pbr material picker.
2024-04-16 22:33:14 +02:00
240f807ed1
new texture panel: fix default and blank texture entries for texture swatches
2024-04-15 16:38:58 +02:00
33c4c3a703
Normalize the setting names to have FS prefixes+tweak defaults
2024-04-13 21:53:45 +01:00
e1665ddb4b
remove conditional enabling, we want to be able to add fallbacks
2024-04-13 18:20:30 +01:00
ab2a74bb2d
update call to selectionSetImage with optional boolean "isPBR"
...
This is keyhole surgery, we inject isPBR into selectionMgr so that it can use use a slightly different apply functor when it passes off to dragdrop controller. Nasty, but for now the least intrusive change.
2024-04-13 17:53:38 +01:00
5372dfc795
Tab change handler to trigger the rendering flips.
2024-04-13 17:46:45 +01:00
Ansariel