fix default mat being missing in builds

KhronosGroup · Dec 2, 2022 · 74c594e · 74c594e
1 parent 03bc55b
commit 74c594e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/UnityGLTF/Assets/UnityGLTF/CHANGELOG.md b/UnityGLTF/Assets/UnityGLTF/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.18.5-pre] - 2022-12-02
+- fix: default material was missing in build
+
 ## [1.18.4-pre] - 2022-12-02
 - fix: GLTFRecorder didn't properly record with animation pointer off anymore
 - fix: unified access to SkinnedMeshRenderer weights on export

diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Scripts/SceneExporter/ExporterMaterials.cs b/UnityGLTF/Assets/UnityGLTF/Runtime/Scripts/SceneExporter/ExporterMaterials.cs
@@ -30,7 +30,21 @@ public static Material DefaultMaterial
 		{
 			get
 			{
-				if(!_defaultMaterial) _defaultMaterial = new Material(Shader.Find("Unlit/Texture"));
+				if (_defaultMaterial) return _defaultMaterial;
+
+#if UNITY_2019_3_OR_NEWER
+				var pipelineAsset = GraphicsSettings.currentRenderPipeline;
+				if (pipelineAsset)
+				{
+					_defaultMaterial = pipelineAsset.defaultMaterial;
+				}
+				else
+#endif
+				{
+					var shader = Shader.Find("Legacy Shaders/Diffuse"); // by default in the always included shaders list
+					if (shader)
+						_defaultMaterial = new Material(shader);
+				}
 				return _defaultMaterial;
 			}
 		}

diff --git a/UnityGLTF/Assets/UnityGLTF/package.json b/UnityGLTF/Assets/UnityGLTF/package.json
@@ -1,7 +1,7 @@
 {
   "name": "org.khronos.unitygltf",
   "displayName": "UnityGLTF",
-  "version": "1.18.4-pre",
+  "version": "1.18.5-pre",
   "unity": "2019.4",
   "description": "Unity3D library for importing and exporting GLTF 2.0 assets. https://github.com/KhronosGroup/UnityGLTF",
   "keywords": [