godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70651 from aaronfranke/3.x-gltf-null-cond 

[3.x] GLTF: Fix wrong error macro used in a few spots
This commit is contained in:
Aaron Franke 2022-12-31 22:56:05 -06:00 committed by GitHub
parent 0f10eafb38 ca898a7b77
commit dc3d66bc8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gltf/extensions/gltf_document_extension.cpp
View File

@ -138,8 +138,8 @@ Error GLTFDocumentExtension::export_preflight(Ref<GLTFState> p_state, Node *p_ro
} }
void GLTFDocumentExtension::convert_scene_node(Ref<GLTFState> p_state, Ref<GLTFNode> p_gltf_node, Node *p_scene_node) { void GLTFDocumentExtension::convert_scene_node(Ref<GLTFState> p_state, Ref<GLTFNode> p_gltf_node, Node *p_scene_node) {
ERR_FAIL_NULL(p_state.is_null()); ERR_FAIL_COND(p_state.is_null());
ERR_FAIL_NULL(p_gltf_node.is_null()); ERR_FAIL_COND(p_gltf_node.is_null());
ERR_FAIL_NULL(p_scene_node); ERR_FAIL_NULL(p_scene_node);
ScriptInstance *si = get_script_instance(); ScriptInstance *si = get_script_instance();
if (!si) { if (!si) {
@ -149,8 +149,8 @@ void GLTFDocumentExtension::convert_scene_node(Ref<GLTFState> p_state, Ref<GLTFN
} }
Error GLTFDocumentExtension::export_node(Ref<GLTFState> p_state, Ref<GLTFNode> p_gltf_node, Dictionary &r_dict, Node *p_node) { Error GLTFDocumentExtension::export_node(Ref<GLTFState> p_state, Ref<GLTFNode> p_gltf_node, Dictionary &r_dict, Node *p_node) {
ERR_FAIL_NULL_V(p_state.is_null(), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(p_state.is_null(), ERR_INVALID_PARAMETER);
ERR_FAIL_NULL_V(p_gltf_node.is_null(), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(p_gltf_node.is_null(), ERR_INVALID_PARAMETER);
ERR_FAIL_NULL_V(p_node, ERR_INVALID_PARAMETER); ERR_FAIL_NULL_V(p_node, ERR_INVALID_PARAMETER);
ScriptInstance *si = get_script_instance(); ScriptInstance *si = get_script_instance();
if (!si) { if (!si) {
@ -161,7 +161,7 @@ Error GLTFDocumentExtension::export_node(Ref<GLTFState> p_state, Ref<GLTFNode> p
} }
Error GLTFDocumentExtension::export_post(Ref<GLTFState> p_state) { Error GLTFDocumentExtension::export_post(Ref<GLTFState> p_state) {
ERR_FAIL_NULL_V(p_state.is_null(), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(p_state.is_null(), ERR_INVALID_PARAMETER);
ScriptInstance *si = get_script_instance(); ScriptInstance *si = get_script_instance();
if (!si) { if (!si) {
return Error::OK; return Error::OK;