Improved EditorResourceAsset load and shader warnings

Author: ellioman

com.unity.render-pipelines.universal/CHANGELOG.md

@@ -168,6 +168,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed shader compilation errors when using multiple lights in DX10 level GPU. [case 1222302](https://issuetracker.unity3d.com/issues/urp-no-materials-apart-from-ui-are-rendered-when-using-direct3d11-graphics-api-on-a-dx10-gpu)
 - Fixed an issue with shadows not being correctly calculated in some shaders.
 - Fixed invalid implementation of one function in LWRP -> URP backward compatibility support.
+- Fixed issues with performance when importing fbx files
+- Fixed issues with NullReferenceException happening with URP shaders after rebuilding project
 
 ## [7.1.1] - 2019-09-05
 ### Upgrade Guide

com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs

@@ -180,6 +180,7 @@ public class UniversalRenderPipelineAsset : RenderPipelineAsset, ISerializationC
         internal UniversalRenderPipelineEditorResources m_EditorResourcesAsset;
 
         public static readonly string packagePath = "Packages/com.unity.render-pipelines.universal";
+        public static readonly string editorResourcesGUID = "a3d8d823eedde654bb4c11a1cfaf1abb";
 
         public static UniversalRenderPipelineAsset Create(ScriptableRendererData rendererData = null)
         {
@@ -189,8 +190,10 @@ public static UniversalRenderPipelineAsset Create(ScriptableRendererData rendere
                 instance.m_RendererDataList[0] = rendererData;
             else
                 instance.m_RendererDataList[0] = CreateInstance<ForwardRendererData>();
+            
             // Initialize default Renderer
-            instance.m_EditorResourcesAsset = LoadResourceFile<UniversalRenderPipelineEditorResources>();
+            instance.m_EditorResourcesAsset = instance.editorResources;
+
             return instance;
         }
 
@@ -247,38 +250,15 @@ static void CreateUniversalPipelineEditorResources()
             AssetDatabase.CreateAsset(instance, string.Format("Assets/{0}.asset", typeof(UniversalRenderPipelineEditorResources).Name));
         }
 
-        static T LoadResourceFile<T>() where T : ScriptableObject
-        {
-            T resourceAsset = null;
-            var guids = AssetDatabase.FindAssets(typeof(T).Name + " t:scriptableobject", new[] { "Assets" });
-            foreach (string guid in guids)
-            {
-                string path = AssetDatabase.GUIDToAssetPath(guid);
-                resourceAsset = AssetDatabase.LoadAssetAtPath<T>(path);
-                if (resourceAsset != null)
-                    break;
-            }
-
-            // There's currently an issue that prevents FindAssets from find resources withing the package folder.
-            if (resourceAsset == null)
-            {
-                string path = packagePath + "/Runtime/Data/" + typeof(T).Name + ".asset";
-                resourceAsset = AssetDatabase.LoadAssetAtPath<T>(path);
-            }
-
-            // Validate the resource file
-            ResourceReloader.TryReloadAllNullIn(resourceAsset, packagePath);
-
-            return resourceAsset;
-        }
-
         UniversalRenderPipelineEditorResources editorResources
         {
             get
             {
-                if (m_EditorResourcesAsset == null)
-                    m_EditorResourcesAsset = LoadResourceFile<UniversalRenderPipelineEditorResources>();
+                if (m_EditorResourcesAsset != null && !m_EditorResourcesAsset.Equals(null))
+                    return m_EditorResourcesAsset;
 
+                string resourcePath = AssetDatabase.GUIDToAssetPath(editorResourcesGUID);
+                m_EditorResourcesAsset = AssetDatabase.LoadAssetAtPath<UniversalRenderPipelineEditorResources>(resourcePath);
                 return m_EditorResourcesAsset;
             }
         }
@@ -707,42 +687,42 @@ public override Shader defaultShader
 #if UNITY_EDITOR
         public override Shader autodeskInteractiveShader
         {
-            get { return editorResources.shaders.autodeskInteractivePS; }
+            get { return editorResources?.shaders.autodeskInteractivePS; }
         }
 
         public override Shader autodeskInteractiveTransparentShader
         {
-            get { return editorResources.shaders.autodeskInteractiveTransparentPS; }
+            get { return editorResources?.shaders.autodeskInteractiveTransparentPS; }
         }
 
         public override Shader autodeskInteractiveMaskedShader
         {
-            get { return editorResources.shaders.autodeskInteractiveMaskedPS; }
+            get { return editorResources?.shaders.autodeskInteractiveMaskedPS; }
         }
 
         public override Shader terrainDetailLitShader
         {
-            get { return editorResources.shaders.terrainDetailLitPS; }
+            get { return editorResources?.shaders.terrainDetailLitPS; }
         }
 
         public override Shader terrainDetailGrassShader
         {
-            get { return editorResources.shaders.terrainDetailGrassPS; }
+            get { return editorResources?.shaders.terrainDetailGrassPS; }
         }
 
         public override Shader terrainDetailGrassBillboardShader
         {
-            get { return editorResources.shaders.terrainDetailGrassBillboardPS; }
+            get { return editorResources?.shaders.terrainDetailGrassBillboardPS; }
         }
 
         public override Shader defaultSpeedTree7Shader
         {
-            get { return editorResources.shaders.defaultSpeedTree7PS; }
+            get { return editorResources?.shaders.defaultSpeedTree7PS; }
         }
 
         public override Shader defaultSpeedTree8Shader
         {
-            get { return editorResources.shaders.defaultSpeedTree8PS; }
+            get { return editorResources?.shaders.defaultSpeedTree8PS; }
         }
 #endif
 

com.unity.render-pipelines.universal/Tests/Editor/EditorTests.cs

@@ -53,15 +53,18 @@ public void CreateForwardRendererAssetWithoutErrors()
         }
     }
 
-    // Validate that resources Guids are valid
+    // Validate that resource Guids are valid
     [Test]
     public void ValidateBuiltinResourceFiles()
     {
         string templatePath = AssetDatabase.GUIDToAssetPath(ResourceGuid.rendererTemplate);
         Assert.IsFalse(string.IsNullOrEmpty(templatePath));
+
+        string editorResourcesPath = AssetDatabase.GUIDToAssetPath(UniversalRenderPipelineAsset.editorResourcesGUID);
+        Assert.IsFalse(string.IsNullOrEmpty(editorResourcesPath));
     }
 
-    // When creating LWRP all required resources should be initialized.
+    // When creating URP all required resources should be initialized.
     [Test]
     public void ValidateNewAssetResources()
     {
@@ -73,7 +76,7 @@ public void ValidateNewAssetResources()
         Assert.AreNotEqual(null, asset.defaultTerrainMaterial);
         Assert.AreNotEqual(null, asset.defaultShader);
 
-        // LWRP doesn't override the following materials
+        // URP doesn't override the following materials
         Assert.AreEqual(null, asset.defaultUIMaterial);
         Assert.AreEqual(null, asset.defaultUIOverdrawMaterial);
         Assert.AreEqual(null, asset.defaultUIETC1SupportedMaterial);
@@ -85,7 +88,7 @@ public void ValidateNewAssetResources()
         ScriptableObject.DestroyImmediate(data);
     }
 
-    // When changing LWRP settings, all settings should be valid.
+    // When changing URP settings, all settings should be valid.
     [Test]
     public void ValidateAssetSettings()
     {