summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloatergltfasseteditor.cpp2
-rw-r--r--indra/newview/llviewerobject.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatergltfasseteditor.cpp b/indra/newview/llfloatergltfasseteditor.cpp
index c1946e9f96..13e0d36c35 100644
--- a/indra/newview/llfloatergltfasseteditor.cpp
+++ b/indra/newview/llfloatergltfasseteditor.cpp
@@ -155,7 +155,6 @@ void LLFloaterGLTFAssetEditor::onClose(bool app_quitting)
gIdleCallbacks.deleteFunction(idle, this);
mAsset = nullptr;
mObject = nullptr;
-
}
void LLFloaterGLTFAssetEditor::clearRoot()
@@ -458,6 +457,7 @@ void LLFloaterGLTFAssetEditor::loadNodeTransforms(S32 node_id)
}
LL::GLTF::Node& node = mAsset->mNodes[node_id];
+ node.makeTRSValid();
mCtrlPosX->set(node.mTranslation[0]);
mCtrlPosY->set(node.mTranslation[1]);
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 232b020d3d..85017c61ed 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -4418,6 +4418,7 @@ void LLViewerObject::moveGLTFNode(S32 node_index, const LLVector3& offset)
matMul(trans, mat, mat);
node.mMatrix = glm::make_mat4(mat.getF32ptr());
+ node.mTRSValid = false;
// TODO -- only update transforms for this node and its children (or use a dirty flag)
mGLTFAsset->updateTransforms();