Fix inspector in 2019.4

Add handling for changes Unity made to custom editor finding in 2019
MerlinVR · Jul 17, 2021 · a1e1a49 · a1e1a49
1 parent c6ecc13
commit a1e1a49
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -69,6 +69,7 @@ Assets/UdonSharp/Scripts/Editor.meta
 .idea/*
 Assets/Udon.meta
 [Aa]ssets/SerializedUdonPrograms*
+Packages/
 
 # UdonSharp stuff
 /Assets/UdonSharp/UdonSharpSettings.asset

diff --git a/Assets/Plugins.meta b/Assets/Plugins.meta
diff --git a/Assets/Plugins/Editor.meta b/Assets/Plugins/Editor.meta
diff --git a/Assets/UdonSharp/Editor/Editors/UdonSharpBehaviourEditor.cs b/Assets/UdonSharp/Editor/Editors/UdonSharpBehaviourEditor.cs
@@ -160,7 +160,9 @@ static UdonBehaviourDrawerOverride()
         /// </summary>
         public static void OverrideUdonBehaviourDrawer() 
         {
+        #if !UNITY_2019_4_OR_NEWER
             if (customEditorField == null)
+        #endif
             {
                 Assembly editorAssembly = typeof(UnityEditor.Editor).Assembly;
 
@@ -205,7 +207,22 @@ public static void OverrideUdonBehaviourDrawer()
                 editorTypeList = Activator.CreateInstance(monoEditorTypeListType);
 
                 listCreateParams[0] = editorTypeObject;
+
+            #if UNITY_2019_4_OR_NEWER
+                FieldInfo initializedField = editorAttributesClass.GetField("s_Initialized", BindingFlags.Static | BindingFlags.NonPublic);
+
+                if (!(bool) initializedField.GetValue(null))
+                {
+                    MethodInfo rebuildMethod =
+                        editorAttributesClass.GetMethod("Rebuild", BindingFlags.Static | BindingFlags.NonPublic);
+
+                    rebuildMethod.Invoke(null, null);
+
+                    initializedField.SetValue(null, true);
+                }
+            #endif
             }
+
 
             listClearMethod.Invoke(editorTypeList, null);
             listAddTypeMethod.Invoke(editorTypeList, listCreateParams);