diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-04-17 16:12:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-17 16:12:49 -0500 |
| commit | bc93177ea0788a245554882b6d721eae2e057206 (patch) | |
| tree | 5b15cf6b55ff8e200e763ae720771f3f91ead8f3 /indra/newview/llfetchedgltfmaterial.h | |
| parent | d46811d60d8fca4a9908b4e989b14905345928bd (diff) | |
1176 integrate llgltfnode with selection manager and llmaniptranslate/rotate (#1258)
* #1176 Somewhat working GLTF Node support for translate tool
* #1176 Missing file from last commit
* #1176 Better translation for rotated nodes.
* #1176 Fix for objects snapping back to original position
* #1176 GLTF Samples compatibility pass -- attempt at improving rotation manip support, incidental cleanup, GLTF node debug display
* #1176 Clean out some unused and not working functions.
* #1176 Fix for mac build, incidental cleanup
* Mac build fix
Diffstat (limited to 'indra/newview/llfetchedgltfmaterial.h')
| -rw-r--r-- | indra/newview/llfetchedgltfmaterial.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfetchedgltfmaterial.h b/indra/newview/llfetchedgltfmaterial.h index 42c835a416..7550c75b45 100644 --- a/indra/newview/llfetchedgltfmaterial.h +++ b/indra/newview/llfetchedgltfmaterial.h @@ -66,6 +66,8 @@ public: std::set<LLTextureEntry*> mTextureEntires; + // default material for when assets don't have one + static LLFetchedGLTFMaterial sDefault; protected: // Lifetime management |