summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-11-23 10:56:41 +0100
committerGitHub <noreply@github.com>2021-11-23 10:56:41 +0100
commite32dbb987b78dfa25468d475c009ec9ee36a27dc (patch)
tree607726e3fc980a53f758724d7763584fd943be37
parent94959cb16bbe09ff4004f1cb578d157671894dc8 (diff)
parent8f433a1f532f7ffeaada357e53ca1fe8a30c5c94 (diff)
Merge pull request #55245 from jitspoe/master.gltf_export_missing_skin_crash_fix
-rw-r--r--modules/gltf/gltf_document.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp
index fac1e61b18..f3317aeada 100644
--- a/modules/gltf/gltf_document.cpp
+++ b/modules/gltf/gltf_document.cpp
@@ -6115,7 +6115,10 @@ void GLTFDocument::_convert_mesh_instances(Ref<GLTFState> state) {
int bone_cnt = skeleton->get_bone_count();
ERR_FAIL_COND(bone_cnt != gltf_skeleton->joints.size());
- ObjectID gltf_skin_key = skin->get_instance_id();
+ ObjectID gltf_skin_key;
+ if (skin.is_valid()) {
+ gltf_skin_key = skin->get_instance_id();
+ }
ObjectID gltf_skel_key = godot_skeleton->get_instance_id();
GLTFSkinIndex skin_gltf_i = -1;
GLTFNodeIndex root_gltf_i = -1;