Age | Commit message (Collapse) | Author |
|
# Conflicts:
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllocalbitmaps.h
# indra/newview/llviewerregion.cpp
# lllocalgltfmaterials.* were modified to match lllocalbitmaps*
|
|
|
|
following promotion of DRTVWR-483
|
|
|
|
|
|
black outlines on AMD
|
|
|
|
|
|
|
|
If ORM is blank the roughness and metal are multiplied into a default white ORM texture. This reverts commit 71ae65ae175a33c7f60442f62b0ef59415528bf5.
|
|
DRTVWR-559
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
don't blow bloom out
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
material setup for both IBL and Sunlight BRDF
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
build floater texture tab: First pass - some edge cases remaining. User can now edit an object or set of objects, choose a material and have it apply as expected
|
|
filtered inventory panel and pull in @Caladbolg's fix to make it work with more than 1 asset type from here https://bitbucket.org/lindenlab/viewer/commits/0ab6dfa12eb04238d82c7a4aea7390cbd28beacd
|