diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-07-04 07:19:15 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-07-04 08:29:37 +0300 |
| commit | b099dbef27f2af47a421bb9848cfbca1aaa08327 (patch) | |
| tree | 815d0990b78d3cff8f70a550e9c474cc8a33d779 /indra | |
| parent | 08b933a0c67463f06f124420f16c8a3f7dc83f1f (diff) | |
viewer#1131 Sync 'transform' arrows with UI
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatergltfasseteditor.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 1 |
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(); |