[Port][6000.4][UUM-131564] Fix NullReferenceException when using custom preview mesh in Shader Graph

Author: april-roszkowski

Packages/com.unity.shadergraph/Editor/Drawing/Inspector/MasterPreviewView.cs

@@ -42,7 +42,6 @@ public VisualElement preview
         }
 
         List<string> m_DoNotShowPrimitives = new List<string>(new string[] { PrimitiveType.Plane.ToString() });
-        static Type s_ObjectSelector = AppDomain.CurrentDomain.GetAssemblies().SelectMany(x => x.GetTypesOrNothing()).FirstOrDefault(t => t.FullName == "UnityEditor.ObjectSelector");
 
         public string assetName
         {
@@ -154,12 +153,6 @@ void ChangeMesh(Mesh mesh)
             m_Graph.previewData.serializedMesh.mesh = changedMesh;
         }
 
-        private static EditorWindow Get()
-        {
-            PropertyInfo P = s_ObjectSelector.GetProperty("get", BindingFlags.Public | BindingFlags.Static);
-            return P.GetValue(null, null) as EditorWindow;
-        }
-
         void OnMeshChanged(Object obj)
         {
             var mesh = obj as Mesh;
@@ -178,9 +171,7 @@ void ChangeMeshSprite()
 
         void ChangeMeshCustom()
         {
-            var ShowMethod = s_ObjectSelector.GetMethod("Show", BindingFlags.Instance | BindingFlags.NonPublic, null, new[] { typeof(UnityEngine.Object), typeof(Type), typeof(UnityEngine.Object), typeof(bool), typeof(List<int>), typeof(Action<UnityEngine.Object>), typeof(Action<UnityEngine.Object>), typeof(bool) }, new ParameterModifier[8]);
-            m_PreviousMesh = m_Graph.previewData.serializedMesh.mesh;
-            ShowMethod.Invoke(Get(), new object[] { null, typeof(Mesh), null, false, null, (Action<Object>)OnMeshChanged, (Action<Object>)OnMeshChanged, false });
+            InternalBridge.ObjectSelector.Show(null, typeof(Mesh), null, false, null, (Action<Object>)OnMeshChanged, (Action<Object>)OnMeshChanged, false);
         }
 
         void OnGeometryChanged(GeometryChangedEvent evt)

Packages/com.unity.shadergraph/Editor/InternalBridge.meta

@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Unity.ShaderGraph.Editor")]

Packages/com.unity.shadergraph/Editor/InternalBridge/AssemblyInfo.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+
+namespace UnityEditor.ShaderGraph.InternalBridge
+{
+    internal static class ObjectSelector
+    {
+        public static void Show(UnityEngine.Object obj, Type requiredType, UnityEngine.Object objectBeingEdited,
+            bool allowSceneObjects, List<EntityId> allowedEntityIds = null,
+            Action<UnityEngine.Object> onObjectSelectorClosed = null,
+            Action<UnityEngine.Object> onObjectSelectedUpdated = null, bool showNoneItem = true)
+        {
+            UnityEditor.ObjectSelector.get.Show(obj, requiredType, objectBeingEdited, allowSceneObjects,
+                allowedEntityIds, onObjectSelectorClosed, onObjectSelectedUpdated, showNoneItem);
+        }
+    }
+}

Packages/com.unity.shadergraph/Editor/InternalBridge/AssemblyInfo.cs.meta

@@ -0,0 +1,16 @@
+{
+    "name": "Unity.InternalAPIEditorBridge.ShaderGraph.Editor",
+    "rootNamespace": "",
+    "references": [],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Packages/com.unity.shadergraph/Editor/InternalBridge/ObjectSelector.cs

@@ -5,7 +5,8 @@
         "GUID:ade7125e800904674ba0c115208f7ed5",
         "GUID:4988cf9794f41d64c884876ab6574b89",
         "GUID:df380645f10b7bc4b97d4f5eb6303d95",
-        "GUID:3eae0364be2026648bf74846acb8a731"
+        "GUID:3eae0364be2026648bf74846acb8a731",
+        "GUID:1a9e721432c3e5048950da7f3cf524e7"
     ],
     "includePlatforms": [
         "Editor"