diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-02-28 12:08:46 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-02-28 12:08:46 -0600 |
| commit | 9a024172da94871716791174079c7f9f5eb23f45 (patch) | |
| tree | 09181115e44a29b5850f845e252223bdfa94f3e9 /indra/llprimitive/llgltfmaterial.h | |
| parent | 36f37ebf8a97cf1d5dacf6c8df41bf08375ac002 (diff) | |
| parent | 4478decbe8d085d1de02813712d8d55952e6c4b2 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/llprimitive/llgltfmaterial.h')
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h index cae7284421..e701b62fdc 100644 --- a/indra/llprimitive/llgltfmaterial.h +++ b/indra/llprimitive/llgltfmaterial.h @@ -28,7 +28,6 @@ #include "llrefcount.h" #include "llmemory.h" -#include "m3math.h" #include "v4color.h" #include "v3color.h" #include "v2math.h" @@ -60,7 +59,7 @@ public: LLVector2 mScale = { 1.f, 1.f }; F32 mRotation = 0.f; - LLMatrix3 asMatrix(); + void getPacked(F32 (&packed)[8]); bool operator==(const TextureTransform& other) const; }; |