Browse Source

Merge pull request #53399 from V-Sekai/extension-game-convert

Rémi Verschelde 3 years ago
parent
commit
48768663d6
2 changed files with 3 additions and 2 deletions
  1. 1 1
      modules/gltf/doc_classes/GLTFDocument.xml
  2. 2 1
      modules/gltf/gltf_document.cpp

+ 1 - 1
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,&quot;resource_local_to_scene&quot;:false,&quot;resource_name&quot;:&quot;&quot;,&quot;script&quot;:null)]">
+		<member name="extensions" type="GLTFDocumentExtension[]" setter="set_extensions" getter="get_extensions" default="[]">
 		</member>
 	</members>
 </class>

+ 2 - 1
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;