diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-04 20:11:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-04 20:11:38 +0200 |
| commit | 48768663d60eff7bd0358bdf01dc4b945d085634 (patch) | |
| tree | 14510dd528013592b84d49bf9c608a38c95a92f1 | |
| parent | a2361851dcce0f9ba0ce78ae619aa65d4069bd10 (diff) | |
| parent | fc1634806a7edd3f0e1d84538b8e876f68f2b94a (diff) | |
Merge pull request #53399 from V-Sekai/extension-game-convert
| -rw-r--r-- | modules/gltf/doc_classes/GLTFDocument.xml | 2 | ||||
| -rw-r--r-- | modules/gltf/gltf_document.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/gltf/doc_classes/GLTFDocument.xml b/modules/gltf/doc_classes/GLTFDocument.xml index 77c45da34d..8d8e25e8b3 100644 --- a/modules/gltf/doc_classes/GLTFDocument.xml +++ b/modules/gltf/doc_classes/GLTFDocument.xml @@ -31,7 +31,7 @@ </method> </methods> <members> - <member name="extensions" type="GLTFDocumentExtension[]" setter="set_extensions" getter="get_extensions" default="[Object(GLTFDocumentExtensionConvertImporterMesh,"resource_local_to_scene":false,"resource_name":"","script":null)]"> + <member name="extensions" type="GLTFDocumentExtension[]" setter="set_extensions" getter="get_extensions" default="[]"> </member> </members> </class> diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index c7818e7e86..ba98592600 100644 --- a/modules/gltf/gltf_document.cpp +++ b/modules/gltf/gltf_document.cpp @@ -6887,7 +6887,8 @@ TypedArray<GLTFDocumentExtension> GLTFDocument::get_extensions() const { } GLTFDocument::GLTFDocument() { - if (!::Engine::get_singleton()->is_editor_hint()) { + bool is_editor = ::Engine::get_singleton()->is_editor_hint(); + if (is_editor) { return; } Ref<GLTFDocumentExtensionConvertImporterMesh> extension_editor; |