summaryrefslogtreecommitdiff
path: root/indra/newview/gltf/asset.cpp
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2024-05-30 13:42:27 -0500
committerRunitaiLinden <davep@lindenlab.com>2024-05-30 13:42:27 -0500
commite279aae51a0f43cba0e284da4c0ea7c168316ca1 (patch)
tree27ec179553565e3f452c9dc45b49c4ad7fa91fe3 /indra/newview/gltf/asset.cpp
parent15fd13f83036ff781160957a21bb2d59771044bc (diff)
#1597 Fix for some GLTF transforms not loading properly.
Also incidental fix for unreachable code error.
Diffstat (limited to 'indra/newview/gltf/asset.cpp')
-rw-r--r--indra/newview/gltf/asset.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/gltf/asset.cpp b/indra/newview/gltf/asset.cpp
index 7870eb28b0..7d379c2528 100644
--- a/indra/newview/gltf/asset.cpp
+++ b/indra/newview/gltf/asset.cpp
@@ -300,8 +300,8 @@ void Node::serialize(object& dst) const
{
write(mName, "name", dst);
write(mMatrix, "matrix", dst, glm::identity<mat4>());
- write(mRotation, "rotation", dst);
- write(mTranslation, "translation", dst);
+ write(mRotation, "rotation", dst, glm::identity<quat>());
+ write(mTranslation, "translation", dst, glm::vec3(0.f, 0.f, 0.f));
write(mScale, "scale", dst, vec3(1.f,1.f,1.f));
write(mChildren, "children", dst);
write(mMesh, "mesh", dst, INVALID_INDEX);
@@ -312,7 +312,6 @@ const Node& Node::operator=(const Value& src)
{
copy(src, "name", mName);
mMatrixValid = copy(src, "matrix", mMatrix);
-
copy(src, "rotation", mRotation);
copy(src, "translation", mTranslation);
copy(src, "scale", mScale);