Merge pull request #362 from Unity-Technologies/v4.4/fix-preview-shape-material

SRP: Fix preview shape material

Author: Karl Henkel

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed rect selection not working with Universal Render Pipeline.
 - [case: 1281254] Fixed shader warning in URP for UNITY_PASS_FORWARDBASE macro redefinition.
 - [case: 1294866] Fix annotation warning on InitializeOnLoad call.
+- [case: 1304561] Fix `Shape Preview` not rendering with the blue preview tint.
 
 ## [4.4.1] - 2020-11-10
 

Editor/EditorCore/EditorMaterialUtility.cs

@@ -16,7 +16,10 @@ static class EditorMaterialUtility
 
         static bool s_Initialized;
 
-        static Material s_SrpDefaultMaterial;
+        static Material s_EditorDefaultMaterial;
+        static Material s_ShapePreviewMaterial;
+
+        internal static readonly Color previewColor = new Color(.5f, .9f, 1f, .56f);
 
         [UserSetting("Mesh Settings", "Material", "The default material to be applied to newly created shapes.")]
         static Pref<Material> s_DefaultMaterial = new Pref<Material>("mesh.userMaterial", null);
@@ -27,26 +30,36 @@ static void Init()
                 return;
 
             s_Initialized = true;
+            s_EditorDefaultMaterial = null;
 
-            s_SrpDefaultMaterial = null;
-
-            for (int i = 0, c = k_StandardRenderPipelineDefaultMaterials.Length; i < c && s_SrpDefaultMaterial == null; i++)
+            for (int i = 0, c = k_StandardRenderPipelineDefaultMaterials.Length; i < c && s_EditorDefaultMaterial == null; i++)
             {
                 string search = k_StandardRenderPipelineDefaultMaterials[i] + " t:Material";
                 string[] materials = AssetDatabase.FindAssets(search, new[] { "Assets", "Packages" });
 
                 foreach (var asset in materials)
                 {
-                    s_SrpDefaultMaterial = AssetDatabase.LoadAssetAtPath<Material>(AssetDatabase.GUIDToAssetPath(asset));
+                    var mat = AssetDatabase.LoadAssetAtPath<Material>(AssetDatabase.GUIDToAssetPath(asset));
 
-                    if (s_SrpDefaultMaterial != null
-                        && s_SrpDefaultMaterial.shader != null
-                        && s_SrpDefaultMaterial.shader.isSupported)
+                    if (mat != null && mat.shader != null && mat.shader.isSupported)
+                    {
+                        s_EditorDefaultMaterial = mat;
                         break;
-
-                    s_SrpDefaultMaterial = null;
+                    }
                 }
             }
+
+            if (s_EditorDefaultMaterial == null)
+                s_EditorDefaultMaterial = BuiltinMaterials.defaultMaterial;
+
+            s_ShapePreviewMaterial = new Material(s_EditorDefaultMaterial.shader);
+            s_ShapePreviewMaterial.hideFlags = HideFlags.HideAndDontSave;
+
+            if (s_ShapePreviewMaterial.HasProperty("_MainTex"))
+                s_ShapePreviewMaterial.mainTexture = (Texture2D)Resources.Load("Textures/GridBox_Default");
+
+            if (s_ShapePreviewMaterial.HasProperty("_Color"))
+                s_ShapePreviewMaterial.SetColor("_Color", previewColor);
         }
 
         internal static Texture2D GetPreviewTexture(Material material)
@@ -108,17 +121,19 @@ internal static Material GetUserMaterial()
             var mat = (Material)s_DefaultMaterial;
             if (mat != null)
                 return mat;
-            return GetDefaultMaterial();
+            return GetSrpDefaultMaterial();
         }
 
-        internal static Material GetDefaultMaterial()
+        internal static Material GetSrpDefaultMaterial()
         {
             Init();
+            return s_EditorDefaultMaterial;
+        }
 
-            if (s_SrpDefaultMaterial != null)
-                return s_SrpDefaultMaterial;
-
-            return BuiltinMaterials.defaultMaterial;
+        internal static Material GetShapePreviewMaterial()
+        {
+            Init();
+            return s_ShapePreviewMaterial;
         }
     }
 }

Editor/EditorCore/MaterialPalette.cs

@@ -54,7 +54,7 @@ public void SetDefaultValues()
         {
             array = new Material[10]
             {
-                BuiltinMaterials.defaultMaterial,
+                EditorMaterialUtility.GetUserMaterial(),
                 null,
                 null,
                 null,

Editor/EditorCore/ShapeEditor.cs

@@ -39,11 +39,6 @@ public void ResetParameters()
                 {
                     if(fi.GetValue(this) is IUserSetting setting)
                         setting.Reset();
-                    // if(fi.FieldType.BaseType?.GetGenericTypeDefinition() == typeof(UserSetting<>))
-                    // {
-                    //     var setting = fi.GetValue(this) as IUserSetting;
-                    //     Debug.Log($"Name: {fi.Name}\nType: {fi.FieldType}\nValue {fi.GetValue(this)}");
-                    // }
                 }
             }
         }
@@ -294,7 +289,7 @@ void SetPreviewMesh(ProBuilderMesh mesh)
                 m_PreviewObject.name += "-preview";
             }
 
-            m_PreviewObject.GetComponent<MeshRenderer>().sharedMaterial = BuiltinMaterials.ShapePreviewMaterial;
+            m_PreviewObject.GetComponent<MeshRenderer>().sharedMaterial = EditorMaterialUtility.GetShapePreviewMaterial();
             EditorUtility.MoveToActiveScene(m_PreviewObject.gameObject);
         }
 

Runtime/Core/BuiltinMaterials.cs

@@ -54,8 +54,6 @@ public static class BuiltinMaterials
         /// <seealso cref="pointShader"/>
         public const string dotShader = "Hidden/ProBuilder/VertexShader";
 
-        internal static readonly Color previewColor = new Color(.5f, .9f, 1f, .56f);
-
         static Shader s_SelectionPickerShader;
 
         static bool s_GeometryShadersSupported;
@@ -66,8 +64,6 @@ public static class BuiltinMaterials
         static Material s_EdgePickerMaterial;
         static Material s_UnityDefaultDiffuse;
         static Material s_UnlitVertexColorMaterial;
-        static Material s_ShapePreviewMaterial;
-
 
 #if HDRP_7_1_0_OR_NEWER
         static string k_EdgePickerMaterial = "Materials/EdgePickerHDRP";
@@ -112,7 +108,7 @@ static void Init()
             {
                 Log.Error("VertexPicker material not loaded... please re-install ProBuilder to fix this error.");
                 s_VertexPickerMaterial = new Material(Shader.Find(k_VertexPickerShader));
-        }
+            }
 
             if ((s_EdgePickerMaterial = Resources.Load<Material>(k_EdgePickerMaterial)) == null)
             {
@@ -121,15 +117,6 @@ static void Init()
             }
 
             s_UnlitVertexColorMaterial = (Material)Resources.Load("Materials/UnlitVertexColor", typeof(Material));
-
-            s_ShapePreviewMaterial = new Material(s_DefaultMaterial.shader);
-            s_ShapePreviewMaterial.hideFlags = HideFlags.HideAndDontSave;
-
-            if (s_ShapePreviewMaterial.HasProperty("_MainTex"))
-                s_ShapePreviewMaterial.mainTexture = (Texture2D)Resources.Load("Textures/GridBox_Default");
-
-            if (s_ShapePreviewMaterial.HasProperty("_Color"))
-                s_ShapePreviewMaterial.SetColor("_Color", previewColor);
         }
 
         /// <summary>
@@ -305,14 +292,5 @@ internal static Material unlitVertexColor
                 return s_UnlitVertexColorMaterial;
             }
         }
-
-        internal static Material ShapePreviewMaterial
-        {
-            get
-            {
-                Init();
-                return s_ShapePreviewMaterial;
-            }
-        }
     }
 }