From 99841e2e8d332d466f4e8391716c83a0cf59c9db Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Sun, 8 Jun 2025 00:58:31 +0200
Subject: [PATCH] Fix crash when using invalid node index in skinned mesh

---
 Source/Engine/Graphics/Models/SkinnedMesh.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Engine/Graphics/Models/SkinnedMesh.cpp b/Source/Engine/Graphics/Models/SkinnedMesh.cpp
index 543f3791b..8c1b98ebf 100644
--- a/Source/Engine/Graphics/Models/SkinnedMesh.cpp
+++ b/Source/Engine/Graphics/Models/SkinnedMesh.cpp
@@ -158,6 +158,7 @@ void SkeletonData::Swap(SkeletonData& other)
 
 Transform SkeletonData::GetNodeTransform(int32 nodeIndex) const
 {
+    CHECK_RETURN(Nodes.IsValidIndex(nodeIndex), Transform::Identity);
     const int32 parentIndex = Nodes[nodeIndex].ParentIndex;
     if (parentIndex == -1)
     {
@@ -169,6 +170,7 @@ Transform SkeletonData::GetNodeTransform(int32 nodeIndex) const
 
 void SkeletonData::SetNodeTransform(int32 nodeIndex, const Transform& value)
 {
+    CHECK(Nodes.IsValidIndex(nodeIndex));
     const int32 parentIndex = Nodes[nodeIndex].ParentIndex;
     if (parentIndex == -1)
     {