diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-01-24 13:37:58 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-01-24 13:37:58 +0800 |
| commit | 867b8979de2514e059189239fdb674be232ac4c0 (patch) | |
| tree | 3e9ee8c0fff364211f518fcbc70b97470b30d42b /indra/newview/gltfscenemanager.cpp | |
| parent | a9a601de76da660a454fab779395ab4959765b7a (diff) | |
| parent | aa02a5b3f44243e55f85e121d7d53e96e94a7422 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.12-ForeverFPS' into 2024.12-ForeverFPS
Diffstat (limited to 'indra/newview/gltfscenemanager.cpp')
| -rw-r--r-- | indra/newview/gltfscenemanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/gltfscenemanager.cpp b/indra/newview/gltfscenemanager.cpp index f362fa51cb..737e1da7d1 100644 --- a/indra/newview/gltfscenemanager.cpp +++ b/indra/newview/gltfscenemanager.cpp @@ -975,9 +975,9 @@ void renderAssetDebug(LLViewerObject* obj, Asset* asset) LLVector4a t; agent_to_asset.affineTransform(gDebugRaycastStart, t); - start = glm::make_vec4(t.getF32ptr()); + start = vec4(t); agent_to_asset.affineTransform(gDebugRaycastEnd, t); - end = glm::make_vec4(t.getF32ptr()); + end = vec4(t); start.w = end.w = 1.0; |