bump importer version

KhronosGroup · Jul 26, 2022 · 14f9120 · 14f9120
1 parent 35f439e
commit 14f9120
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/UnityGLTF/Assets/UnityGLTF/Editor/Scripts/GLTFImporter.cs b/UnityGLTF/Assets/UnityGLTF/Editor/Scripts/GLTFImporter.cs
@@ -38,7 +38,7 @@ namespace UnityGLTF
 #if ENABLE_DEFAULT_GLB_IMPORTER
     [ScriptedImporter(3, new[] { "glb", "gltf" })]
 #else
-    [ScriptedImporter(3, null, overrideExts: new[] { "glb", "gltf" })]
+    [ScriptedImporter(4, null, overrideExts: new[] { "glb", "gltf" })]
 #endif
 #else
 	[ScriptedImporter(3, new[] { "glb" })]
@@ -367,8 +367,6 @@ string GetUniqueName(string desiredName)
                 throw;
             }
 
-
-
 #if UNITY_2017_3_OR_NEWER
 	        // We explicitly turn the new identifier on for new imports, that is, when no meta file existed before this import.
 	        if (!_useSceneNameIdentifier)

diff --git a/UnityGLTF/Assets/UnityGLTF/Editor/Scripts/GLTFImporterInspector.cs b/UnityGLTF/Assets/UnityGLTF/Editor/Scripts/GLTFImporterInspector.cs
@@ -63,7 +63,15 @@ public override void OnInspectorGUI()
 				{
 					identifierProp.boolValue = true;
 					serializedObject.ApplyModifiedProperties();
-					Apply();
+					try
+					{
+						ApplyAndImport();
+						GUIUtility.ExitGUI();
+					}
+					catch
+					{
+						// ignore - seems in some cases the GameObjectInspector will throw
+					}
 				}
 			}
 			// EditorGUILayout.PropertyField(serializedObject.FindProperty("_useJpgTextures"), new GUIContent("Use JPG Textures"));