summaryrefslogtreecommitdiff
path: root/indra/newview/gltf/buffer_util.h
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-05-30 17:55:17 +0800
committerErik Kundiman <erik@megapahit.org>2025-05-30 17:55:17 +0800
commitd1353441f91d5776e1f4e72666f7c9de96eecca5 (patch)
treecd22d6ac18a1b64cb5c2a94f793e7d7cf27a8b4b /indra/newview/gltf/buffer_util.h
parent2c8521de6d357d74f5b256cc2f94e9951e654d83 (diff)
parent136149d1a196d2c0c15b9977937e64ccd26c1a49 (diff)
Merge remote-tracking branch 'secondlife/project/gltf-mesh-import' into gltf-mesh-import
Diffstat (limited to 'indra/newview/gltf/buffer_util.h')
-rw-r--r--indra/newview/gltf/buffer_util.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/gltf/buffer_util.h b/indra/newview/gltf/buffer_util.h
index ef9bba8128..2632a0f263 100644
--- a/indra/newview/gltf/buffer_util.h
+++ b/indra/newview/gltf/buffer_util.h
@@ -159,6 +159,12 @@ namespace LL
}
template<>
+ inline void copyVec3<F32, LLColor4U>(F32* src, LLColor4U& dst)
+ {
+ dst.set((U8)(src[0] * 255.f), (U8)(src[1] * 255.f), (U8)(src[2] * 255.f), 255);
+ }
+
+ template<>
inline void copyVec3<U16, LLColor4U>(U16* src, LLColor4U& dst)
{
dst.set((U8)(src[0]), (U8)(src[1]), (U8)(src[2]), 255);