Merge pull request godotengine#90505 from aaronp64/gltfdocument_crash

akien-mga · akien-mga · commit 2e5d2333b782 · 2024-04-11T11:02:57.000+02:00
Fix `GLTFDocument.append_from_scene` crash on null node
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp
@@ -7284,6 +7284,7 @@ Node *GLTFDocument::generate_scene(Ref<GLTFState> p_state, float p_bake_fps, boo
 }
 
 Error GLTFDocument::append_from_scene(Node *p_node, Ref<GLTFState> p_state, uint32_t p_flags) {
+	ERR_FAIL_NULL_V(p_node, FAILED);
 	Ref<GLTFState> state = p_state;
 	ERR_FAIL_COND_V(state.is_null(), FAILED);
 	state->use_named_skin_binds = p_flags & GLTF_IMPORT_USE_NAMED_SKIN_BINDS;

Original file line number	Diff line number	Diff line change
`@@ -7284,6 +7284,7 @@ Node *GLTFDocument::generate_scene(Ref<GLTFState> p_state, float p_bake_fps, boo`
`7284`	`7284`	`}`
`7285`	`7285`
`7286`	`7286`	`Error GLTFDocument::append_from_scene(Node *p_node, Ref<GLTFState> p_state, uint32_t p_flags) {`
	`7287`	`+ ERR_FAIL_NULL_V(p_node, FAILED);`
`7287`	`7288`	`Ref<GLTFState> state = p_state;`
`7288`	`7289`	`ERR_FAIL_COND_V(state.is_null(), FAILED);`
`7289`	`7290`	`state->use_named_skin_binds = p_flags & GLTF_IMPORT_USE_NAMED_SKIN_BINDS;`