Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-26 21:57:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ported: [3.x] GLTF: Fix wrong error macro used in a few spots - aaronfranke

Browse Source 
ca898a7b77
This commit is contained in:
Relintai 2023-01-08 11:33:29 +01:00
parent 5b2fc25338
commit 302f815321
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,8 +139,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) {
@ -150,8 +150,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(p_state.is_null(), ERR_INVALID_PARAMETER);
ERR_FAIL_NULL_V(p_gltf_node.is_null(), ERR_INVALID_PARAMETER); ERR_FAIL_COND(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) {
@ -162,7 +162,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;