c29a661b22
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llglslshader.cpp
# indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
# indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
# indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
# indra/newview/gltf/accessor.cpp
# indra/newview/gltf/accessor.h
# indra/newview/gltf/animation.h
# indra/newview/gltf/asset.cpp
# indra/newview/gltf/primitive.cpp
# indra/newview/gltf/primitive.h
# indra/newview/gltfscenemanager.h
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llimprocessing.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-13 01:54:18 +02:00
c95b4bf3ea
Post-merge - trim trailing whitespace
2024-06-10 20:45:59 +03:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
db627bc354
viewer#1553 Local PBR materials are not applied to the terrain
2024-05-28 16:49:41 +03:00
4419bb8709
more misc: BOOL (int) to real bool
2024-02-12 23:17:22 +02:00
0d8893822d
SL-20523 Local textures not updating on PBR Materials #5
2023-11-06 18:29:42 +02:00
d32bca67f1
DRTVWR-559 Add paranoia checks around typecasts of LLGLTFMaterial to LLFetchedGLTFMaterial
2023-04-14 07:36:13 -05:00
d423263d54
SL-19169 Local material updates aren't applied with non-default transforms
2023-03-23 06:15:09 +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
321c7895d0
SL-18741 Basic bulk upload for gltf materials #1
2022-12-02 10:24:23 +02:00
9f7967fcdc
SL-18727 Save material to Inventoryshould prioritize picked face
2022-11-29 23:36:37 +02:00
11c87378be
SL-18560 Make local materials save correctly from right-click menu
2022-11-04 18:57:48 +02:00
d26f545c5a
SL-18391 Fixed local materials failing to load
2022-11-03 19:57:21 +02:00
e6fb0a9397
SL-18391 Removed direct dependency of local materials onto tinygltf
2022-11-01 18:51:47 +02:00
d1b21bb970
SL-18391 Fix local gltf materials to retain a copy of material
2022-10-20 19:06:14 +03:00
5847218069
SL-18391 Basic GLTF lifetime management
2022-10-19 01:01:03 +03:00
f6762c3de5
SL-18105 Add to/from json capability to LLGLTFMaterial
2022-10-14 17:35:48 -05:00
15ac2f6763
SL-17653 Local materials should reuse existing pointer when present instead of creating a new one.
2022-10-11 00:37:24 +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
8f1d226865
SL-18134 Rename Albedo to Base Color to be more consistent with GLTF spec
2022-09-23 11:19:56 -05:00
d19d827121
Merge branch master (DRTVWR-483) into DRTVWR-559
...
# Conflicts:
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllocalbitmaps.h
# indra/newview/llviewerregion.cpp
# lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-31 00:30:49 +03:00
fbccc0986d
SL-17653 Clean up unneeded filepicker dependency.
2022-08-31 00:18:51 +03: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
Ansariel