summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
2022-11-11SL-18616 Fix for dropping mOverrideAlphaMode on copyDave Parks
2022-11-09Revert "SL-18523: When editing an object's material override, use the ↵Sabrina Shanman
object's material override as a base, rather than its render material (pull request #1190)"
2022-11-08SL-18523: When editing an object's material override, use the object's ↵Cosmic Linden
material override as a base, rather than its render material
2022-11-02Merged in SL-18485 (pull request #1183)Sabrina Shanman
SL-18485: Render GLTF materials with extension KHR_texture_transform with approprate texture transforms
2022-11-02SL-18520 Fix for mac build.Dave Parks
2022-11-02SL-18485: Render GLTF materials with extension KHR_texture_transform with ↵Cosmic Linden
approprate texture transforms
2022-11-02SL-18520 Use GLTF material.extras to pass flags for enabling overriding ↵Dave Parks
alpha mode and double sided to default
2022-11-01SL-18520 WIP - Use off-by-epsilon and special UUID identifier hacks to allow ↵Dave Parks
overriding to default values.
2022-11-01SL-18513 Put profile markers around GLTF code.Dave Parks
2022-10-31SL-18442 Port of Caladbolg's fix for emissive overrides not taking. Remove ↵Dave Parks
unused function.
2022-10-31SL-18446 Fix emissive tintAndrey Kleshchev
2022-10-27SL-18411: GLTF material transform serialization, plus fix improper indexing ↵Cosmic Linden
not matching GLTF spec
2022-10-26SL-18472 Fix for assert when increasing number of texture entries on ↵Dave Parks
existing primitive with overrides applied.
2022-10-26Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-10-26SL-18443 Allow nulling out of override data and implement new override ↵Dave Parks
message protocol.
2022-10-24Merge master into DRTVWR-568 (and fix conflicts)Callum Linden
2022-10-24SL-18105 Add mechanism for applying overrides that were received before ↵Dave Parks
associated ViewerObject was ready to receive them.
2022-10-22SL-18105 When saving an object's material to inventory, save the version ↵Dave Parks
that as overrides applied.
2022-10-21Merge branch 'master' (DRTVWR-548) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llrendertarget.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
2022-10-20SL-18105 Add remaining parameters to applyOverrideDave Parks
2022-10-20Merge branch 'master' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h
2022-10-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-10-20SL-18411: Copy over LLGLTFMaterial changes (most notably various ↵Cosmic Linden
getters/setters and texture transform stub)
2022-10-19Xcode compat fix for SL-18105 material overridesBrad Kittenbrink
2022-10-19SL-18105 Hook up TE override material to render pipe by way of render material.Dave Parks
2022-10-19SL-18105 Hook up render pipe directly to LLTextureEntry::mGLTFMaterial and ↵Dave Parks
add LLViewerFetchedTextures to LLFetchedGLTFMaterial. Lower reflection probe resolution to 128x128 per side.
2022-10-19SL-18105 viewer side for handling Material Override LargeGenericMessageBrad Kittenbrink
LLGLTFMaterialList now decodes gltf json overrides from the server and stores them in LLTextureEntry::mGLTFMaterialOverrides
2022-10-17WIP for SL-17697 live editing now computes diffs of changed material ↵Brad Kittenbrink
properties in tinygltf schema json
2022-10-14SL-18105 Add to/from json capability to LLGLTFMaterialDave Parks
2022-09-27Optimize away constant map finds in getSkinInfo by caching mesh skin into in ↵Rye Mutt
vovolume
2022-09-23SL-18156 Cleanup of MikktSpace integration, apply MikktSpace tangents to all ↵Dave Parks
meshes.
2022-09-23SL-18134 Rename Albedo to Base Color to be more consistent with GLTF specDave Parks
2022-09-17SL-17238 Fix coding policy build issuesAndrey Kleshchev
2022-09-17Try to make sure this also works with the havok version of llphysicsextension.Nicky Dasmijn
2022-09-16Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-09-16SL-18128 Clear out much OpenGL cruft and switch to core profile on AMDDave Parks
2022-09-16Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky Dasmijn
DRTVWR-568_cmake
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-09-15Merge branch 'master' into DRTVWR-568Callum Linden
2022-09-15SL-18156 WIP -- Add NormalizedScale/NormalizedTranslation to mesh assets to ↵Dave Parks
recover mesh's original coordinate frame when generating tangents post download.
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-09-12SL-18095 Add tangents to mesh assets so we can calculate mikktspace tangents ↵Dave Parks
in the mesh's original coordinate frame.
2022-08-24DRTVWR-558: Eliminate many spurious set-not-used variables.Nat Goodspeed
With Xcode 13.4, these unused variables break Release builds.
2022-08-08SL-17937 Fix for broken PBR material batching.Dave Parks
2022-08-05Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-08-05SL-17870 Nudge PBR material textures so they start downloading. (and add ↵Dave Parks
missing validation code for reflection probes network data).
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-08-04Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelobject.cpp
2022-08-04Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterworldmap.cpp # indra/newview/llvovolume.cpp
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 15:06:08 +0000