Unity 2020.1.0a14 C# reference source code

Author: Unity Technologies

Editor/Mono/Annotation/SceneViewCameraWindow.cs

@@ -86,7 +86,7 @@ public override void OnGUI(Rect rect)
             if (m_SceneView == null || m_SceneView.sceneViewState == null)
                 return;
 
-            Draw(rect);
+            Draw();
 
             // Escape closes the window
             if (Event.current.type == EventType.KeyDown && Event.current.keyCode == KeyCode.Escape)
@@ -96,7 +96,7 @@ public override void OnGUI(Rect rect)
             }
         }
 
-        void Draw(Rect rect)
+        void Draw()
         {
             Styles.Init();
 
@@ -172,7 +172,7 @@ void Draw(Rect rect)
             if (Event.current.type == EventType.Repaint)
                 m_WindowSize.y = Math.Min(GUILayoutUtility.GetLastRect().yMax + kContentPadding, kWindowHeight * 3);
 
-            GUILayout.BeginVertical(Styles.settingsArea);
+            GUILayout.EndVertical();
             GUILayout.EndScrollView();
         }
 

Editor/Mono/EditorApplication.cs

@@ -179,7 +179,7 @@ public static void DirtyHierarchyWindowSorting()
 
         public static event Action quitting;
 
-        public static CallbackFunction delayCall;
+        public static event Action delayCall;
 
         // Each time an object is (or a group of objects are) created, renamed, parented, unparented or destroyed this callback is raised.
         public static event Action hierarchyChanged;
@@ -319,7 +319,7 @@ static void Internal_CallUpdateFunctions()
 
         static void Internal_CallDelayFunctions()
         {
-            CallbackFunction delay = delayCall;
+            var delay = delayCall;
             delayCall = null;
 
             if (delay != null)

Editor/Mono/EditorConnectionInternal.bindings.cs

@@ -125,5 +125,18 @@ public static bool TrySendMessage(string messageId, byte[] data, int playerId)
 
         [NativeConditional("ENABLE_PLAYERCONNECTION && UNITY_EDITOR")]
         public extern static void DisconnectAll();
+
+        [NativeConditional("ENABLE_PLAYERCONNECTION")]
+        public extern static UInt32 GetLocalGuid();
+
+        [NativeConditional("ENABLE_PLAYERCONNECTION && UNITY_EDITOR")]
+        extern public static string GetMulticastAddress();
+
+        [NativeConditional("ENABLE_PLAYERCONNECTION && UNITY_EDITOR")]
+        extern public static UInt32 GetMulticastPort();
+
+        [NativeConditional("ENABLE_PLAYERCONNECTION && UNITY_EDITOR")]
+        [NativeName("BuildServerIDString")]
+        extern public static string BuildServerIdentificationFormat(string localIP, UInt32 listenPort, int flags, UInt32 localGuid, UInt32 editorGuid, string idString, bool allowDebugging, string packageString, string projectName);
     }
 }

Editor/Mono/EditorGUI.cs

@@ -2470,86 +2470,96 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
                 if (!property.serializedObject.targetObjects[icount])
                     return null;
             }
+
             // Since the menu items are invoked with delay, we can't assume a SerializedObject we don't own
             // will still be around at that time. Hence create our own copy. (case 1051734)
             SerializedObject serializedObjectCopy = new SerializedObject(property.serializedObject.targetObjects);
             SerializedProperty propertyWithPath = serializedObjectCopy.FindProperty(property.propertyPath);
-            ScriptAttributeUtility.GetHandler(property).AddMenuItems(property, pm);
 
-            SerializedProperty linkedPropertyWithPath = null;
-            if (linkedProperty != null)
+            // FillPropertyContextMenu is now always called when a right click is done on a property.
+            // However we don't want those menu to be added when the property is disabled.
+            if (GUI.enabled)
             {
-                linkedPropertyWithPath = serializedObjectCopy.FindProperty(linkedProperty.propertyPath);
-                ScriptAttributeUtility.GetHandler(linkedProperty).AddMenuItems(linkedProperty, pm);
-            }
+                ScriptAttributeUtility.GetHandler(property).AddMenuItems(property, pm);
 
-            // Would be nice to allow to set to value of a specific target for properties with children too,
-            // but it's not currently supported.
-            if (property.hasMultipleDifferentValues && !property.hasVisibleChildren)
-            {
-                TargetChoiceHandler.AddSetToValueOfTargetMenuItems(pm, propertyWithPath, TargetChoiceHandler.SetToValueOfTarget);
-            }
+                SerializedProperty linkedPropertyWithPath = null;
+                if (linkedProperty != null)
+                {
+                    linkedPropertyWithPath = serializedObjectCopy.FindProperty(linkedProperty.propertyPath);
+                    ScriptAttributeUtility.GetHandler(linkedProperty).AddMenuItems(linkedProperty, pm);
+                }
 
-            if (property.serializedObject.targetObjectsCount == 1 && property.isInstantiatedPrefab && property.prefabOverride)
-            {
-                Object targetObject = property.serializedObject.targetObject;
+                // Would be nice to allow to set to value of a specific target for properties with children too,
+                // but it's not currently supported.
+                if (property.hasMultipleDifferentValues && !property.hasVisibleChildren)
+                {
+                    TargetChoiceHandler.AddSetToValueOfTargetMenuItems(pm, propertyWithPath, TargetChoiceHandler.SetToValueOfTarget);
+                }
 
-                SerializedProperty[] properties;
-                if (linkedProperty == null)
-                    properties = new SerializedProperty[] { propertyWithPath };
-                else
-                    properties = new SerializedProperty[] { propertyWithPath, linkedPropertyWithPath };
+                if (property.serializedObject.targetObjectsCount == 1 && property.isInstantiatedPrefab && property.prefabOverride)
+                {
+                    Object targetObject = property.serializedObject.targetObject;
 
-                PrefabUtility.HandleApplyRevertMenuItems(
-                    null,
-                    targetObject,
-                    (menuItemContent, sourceObject) =>
-                    {
-                        // Add apply menu item for this apply target.
-                        TargetChoiceHandler.PropertyAndSourcePathInfo info = new TargetChoiceHandler.PropertyAndSourcePathInfo();
-                        info.properties = properties;
-                        info.assetPath = AssetDatabase.GetAssetPath(sourceObject);
-                        GameObject rootObject = PrefabUtility.GetRootGameObject(sourceObject);
-                        if (!PrefabUtility.IsPartOfPrefabThatCanBeAppliedTo(rootObject) || EditorUtility.IsPersistent(targetObject))
-                            pm.AddDisabledItem(menuItemContent);
-                        else
-                            pm.AddItem(menuItemContent, false, TargetChoiceHandler.ApplyPrefabPropertyOverride, info);
-                    },
-                    (menuItemContent) =>
-                    {
-                        // Add revert menu item.
-                        pm.AddItem(menuItemContent, false, TargetChoiceHandler.RevertPrefabPropertyOverride, properties);
-                    },
-                    false
-                );
-            }
+                    SerializedProperty[] properties;
+                    if (linkedProperty == null)
+                        properties = new SerializedProperty[] { propertyWithPath };
+                    else
+                        properties = new SerializedProperty[] { propertyWithPath, linkedPropertyWithPath };
 
-            // If property is an element in an array, show duplicate and delete menu options
-            if (property.propertyPath.LastIndexOf(']') == property.propertyPath.Length - 1)
-            {
-                var parentArrayPropertyPath = property.propertyPath.Substring(0, property.propertyPath.LastIndexOf(".Array.data[", StringComparison.Ordinal));
-                var parentArrayProperty = property.serializedObject.FindProperty(parentArrayPropertyPath);
+                    PrefabUtility.HandleApplyRevertMenuItems(
+                        null,
+                        targetObject,
+                        (menuItemContent, sourceObject) =>
+                        {
+                            // Add apply menu item for this apply target.
+                            TargetChoiceHandler.PropertyAndSourcePathInfo info = new TargetChoiceHandler.PropertyAndSourcePathInfo();
+                            info.properties = properties;
+                            info.assetPath = AssetDatabase.GetAssetPath(sourceObject);
+                            GameObject rootObject = PrefabUtility.GetRootGameObject(sourceObject);
+                            if (!PrefabUtility.IsPartOfPrefabThatCanBeAppliedTo(rootObject) || EditorUtility.IsPersistent(targetObject))
+                                pm.AddDisabledItem(menuItemContent);
+                            else
+                                pm.AddItem(menuItemContent, false, TargetChoiceHandler.ApplyPrefabPropertyOverride, info);
+                        },
+                        (menuItemContent) =>
+                        {
+                            // Add revert menu item.
+                            pm.AddItem(menuItemContent, false, TargetChoiceHandler.RevertPrefabPropertyOverride, properties);
+                        },
+                        false
+                    );
+                }
 
-                if (!parentArrayProperty.isFixedBuffer)
+                // If property is an element in an array, show duplicate and delete menu options
+                if (property.propertyPath.LastIndexOf(']') == property.propertyPath.Length - 1)
                 {
-                    if (pm.GetItemCount() > 0)
+                    var parentArrayPropertyPath = property.propertyPath.Substring(0, property.propertyPath.LastIndexOf(".Array.data[", StringComparison.Ordinal));
+                    var parentArrayProperty = property.serializedObject.FindProperty(parentArrayPropertyPath);
+
+                    if (!parentArrayProperty.isFixedBuffer)
                     {
-                        pm.AddSeparator("");
+                        if (pm.GetItemCount() > 0)
+                        {
+                            pm.AddSeparator("");
+                        }
+
+                        pm.AddItem(EditorGUIUtility.TrTextContent("Duplicate Array Element"), false, (a) =>
+                        {
+                            TargetChoiceHandler.DuplicateArrayElement(a);
+                            EditorGUIUtility.editingTextField = false;
+                        }, propertyWithPath);
+                        pm.AddItem(EditorGUIUtility.TrTextContent("Delete Array Element"), false, (a) =>
+                        {
+                            TargetChoiceHandler.DeleteArrayElement(a);
+                            EditorGUIUtility.editingTextField = false;
+                        }, propertyWithPath);
                     }
-                    pm.AddItem(EditorGUIUtility.TrTextContent("Duplicate Array Element"), false, (a) =>
-                    {
-                        TargetChoiceHandler.DuplicateArrayElement(a);
-                        EditorGUIUtility.editingTextField = false;
-                    }, propertyWithPath);
-                    pm.AddItem(EditorGUIUtility.TrTextContent("Delete Array Element"), false, (a) =>
-                    {
-                        TargetChoiceHandler.DeleteArrayElement(a);
-                        EditorGUIUtility.editingTextField = false;
-                    }, propertyWithPath);
                 }
             }
 
             // If shift is held down, show debug menu options
+            // This menu is not excluded when the field is disabled
+            // because it is nice to get information about the property even when it's disabled.
             if (Event.current.shift)
             {
                 if (pm.GetItemCount() > 0)
@@ -2558,6 +2568,8 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
             }
 
             // If property is a reference and we're using VCS, add item to check it out
+            // This menu is not excluded when the field is disabled
+            // because it is nice to get information about the property even when it's disabled.
             if (propertyWithPath.propertyType == SerializedPropertyType.ObjectReference && Provider.isActive)
             {
                 var obj = propertyWithPath.objectReferenceValue;
@@ -2573,13 +2585,20 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
                 }
             }
 
-            if (EditorApplication.contextualPropertyMenu != null)
+            // FillPropertyContextMenu is now always called when a right click is done on a property.
+            // However we don't want those menu to be added when the property is disabled.
+            if (GUI.enabled)
             {
-                if (pm.GetItemCount() > 0)
-                    pm.AddSeparator("");
-                EditorApplication.contextualPropertyMenu(pm, property);
+                if (EditorApplication.contextualPropertyMenu != null)
+                {
+                    if (pm.GetItemCount() > 0)
+                        pm.AddSeparator("");
+                    EditorApplication.contextualPropertyMenu(pm, property);
+                }
             }
 
+            EditorGUIUtility.ContextualPropertyMenuCallback(pm, property);
+
             return pm;
         }
 
@@ -5768,6 +5787,8 @@ internal static GUIContent BeginPropertyInternal(Rect totalPosition, GUIContent
 
             s_PropertyStack.Push(new PropertyGUIData(property, totalPosition, wasBoldDefaultFont, GUI.enabled, GUI.backgroundColor));
 
+            EditorGUIUtility.BeginPropertyCallback(totalPosition, property);
+
             if (GUIDebugger.active && Event.current.type != EventType.Layout)
             {
                 var targetObjectTypeName = property.serializedObject.targetObject != null ?
@@ -5830,13 +5851,17 @@ public static void EndProperty()
             // Handle context menu in EndProperty instead of BeginProperty. This ensures that child properties
             // get the event rather than parent properties when clicking inside the child property rects, but the menu can
             // still be invoked for the parent property by clicking inside the parent rect but outside the child rects.
+            var oldEnable = GUI.enabled;
+            GUI.enabled = true; // Event.current.type will never return ContextClick if the GUI is disabled.
             if (Event.current.type == EventType.ContextClick && data.totalPosition.Contains(Event.current.mousePosition))
             {
+                GUI.enabled = oldEnable;
                 if (linkedProperties)
                     DoPropertyContextMenu(data.property, parentData.property);
                 else
                     DoPropertyContextMenu(data.property);
             }
+            GUI.enabled = oldEnable;
 
             EditorGUIUtility.SetBoldDefaultFont(data.wasBoldDefaultFont);
             GUI.enabled = data.wasEnabled;

Editor/Mono/EditorGUIUtility.cs

@@ -103,6 +103,25 @@ static EditorGUIUtility()
             s_HasCurrentWindowKeyFocusFunc = HasCurrentWindowKeyFocus;
         }
 
+        // this method gets called on right clicking a property regardless of GUI.enable value.
+        internal static event Action<GenericMenu, SerializedProperty> contextualPropertyMenu;
+        internal static event Action<Rect, SerializedProperty> beginProperty;
+
+        internal static void BeginPropertyCallback(Rect totalRect, SerializedProperty property)
+        {
+            beginProperty?.Invoke(totalRect, property);
+        }
+
+        internal static void ContextualPropertyMenuCallback(GenericMenu gm, SerializedProperty prop)
+        {
+            if (contextualPropertyMenu != null)
+            {
+                if (gm.GetItemCount() > 0)
+                    gm.AddSeparator("");
+                contextualPropertyMenu(gm, prop);
+            }
+        }
+
         // returns position and size of the main Unity Editor window
         public static Rect GetMainWindowPosition()
         {

Editor/Mono/EditorSettings.bindings.cs

@@ -251,6 +251,9 @@ internal static extern string Internal_ProjectGenerationUserExtensions
         [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
         public static extern EnterPlayModeOptions enterPlayModeOptions { get; set; }
 
+        [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
+        public static extern bool serializeInlineMappingsOnOneLine { get; set; }
+
         [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
         public static extern AssetPipelineMode assetPipelineMode { get; set; }
 

Editor/Mono/EditorUserBuildSettings.bindings.cs

@@ -679,6 +679,15 @@ public static extern bool switchRedirectWritesToHostMount
             set;
         }
 
+        // Enable using the HTC devkit connection for script debugging
+        public static extern bool switchHTCSScriptDebugging
+        {
+            [NativeMethod("GetHTCSScriptDebuggingForSwitch")]
+            get;
+            [NativeMethod("SetHTCSScriptDebuggingForSwitch")]
+            set;
+        }
+
         internal static extern SwitchShaderCompilerConfig switchShaderCompilerConfig
         {
             [NativeMethod("GetSwitchShaderCompilerConfig")]

Editor/Mono/GI/LightingSettings.bindings.cs

@@ -74,7 +74,10 @@ public enum DenoiserType
             Optix = 1,
 
             // The Intel Open Image AI denoiser is applied.
-            OpenImage = 2
+            OpenImage = 2,
+
+            // The AMD Radeon Pro Image Processing denoiser is applied.
+            RadeonPro = 3
         }
 
         // Which path tracer filter is used.
@@ -259,5 +262,9 @@ public bool autoGenerate
         // How many reference points to generate when using MIS
         [NativeName("PVREnvironmentReferencePointCount")]
         internal extern int environmentReferencePointCount { get; set; }
+
+        // How many samples to use for light probes relative to lightmap texels
+        [NativeName("LightProbeSampleCountMultiplier")]
+        public extern float lightProbeSampleCountMultiplier { get; set; }
     }
 }