Unity 6000.1.4f1 C# reference source code

Author: Unity Technologies

Editor/Mono/2D/SpriteAtlas/SpriteAtlasInspector.cs

@@ -132,7 +132,6 @@ private enum AtlasType { Undefined = -1, Master = 0, Variant = 1 }
  private string m_Hash;
  private int m_PreviewPage = 0;
  private int m_TotalPages = 0;
- const float kPrefixLabelWidth = 290f;
  private int[] m_OptionValues = null;
  private string[] m_OptionDisplays = null;
  private Texture2D[] m_PreviewTextures = null;
@@ -365,9 +364,6 @@ public override void OnInspectorGUI()
 
  serializedObject.Update();
 
- var oldWidth = EditorGUIUtility.labelWidth;
- EditorGUIUtility.labelWidth = kPrefixLabelWidth;
-
  HandleCommonSettingUI();
 
  GUILayout.Space(EditorGUI.kSpacing);
@@ -418,7 +414,6 @@ public override void OnInspectorGUI()
  }
  }
 
- EditorGUIUtility.labelWidth = oldWidth;
  serializedObject.ApplyModifiedProperties();
  }
 

Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs

@@ -1027,7 +1027,7 @@ private bool HasReasonToCompile()
 
  private bool SupportsRunInBackground(NamedBuildTarget buildTarget)
  {
- return buildTarget == NamedBuildTarget.Standalone;
+ return buildTarget == NamedBuildTarget.Standalone || buildTarget == NamedBuildTarget.VisionOS;
  }
 
  private void OnPresetSelectorClosed()

Editor/Mono/Inspector/UnityEventDrawer.cs

@@ -369,6 +369,23 @@ static PersistentListenerMode GetMode(SerializedProperty mode)
  return (PersistentListenerMode)mode.enumValueIndex;
  }
 
+ internal static bool ShouldClearMethodAfterTargetChanged(SerializedProperty listener, Object newValue)
+ {
+ // If the type is the same we dont need to clear the method
+ var typeProperty = listener.FindPropertyRelative(kInstanceTypePath);
+ var typeString = typeProperty.stringValue;
+ if (!string.IsNullOrEmpty(typeString))
+ {
+ var objType = Type.GetType(typeString, false);
+
+ if (objType == null || newValue == null || newValue.GetType() != objType)
+ return true;
+ }
+
+ // Clear if the value is null
+ return newValue == null;
+ }
+
  protected virtual void DrawEvent(Rect rect, int index, bool isActive, bool isFocused)
  {
  var pListener = m_ListenersArray.GetArrayElementAtIndex(index);
@@ -396,8 +413,10 @@ protected virtual void DrawEvent(Rect rect, int index, bool isActive, bool isFoc
  {
  GUI.Box(goRect, GUIContent.none);
  EditorGUI.PropertyField(goRect, listenerTarget, GUIContent.none);
- if (EditorGUI.EndChangeCheck())
+ if (EditorGUI.EndChangeCheck() && ShouldClearMethodAfterTargetChanged(pListener, listenerTarget.objectReferenceValue))
+ {
  methodName.stringValue = null;
+ }
  }
 
  SerializedProperty argument = GetArgument(pListener);

Editor/Mono/RenderPipelineGraphicsSettingsCollectionPropertyDrawer.cs

@@ -86,21 +86,21 @@ void DrawHelpButton(VisualElement root, HelpURLAttribute helpURLAttribute)
  }
  }
 
- void ShowContextualMenu(Rect rect, List<LeafElement<SettingsInfo>> siblings, SerializedProperty property)
+ void ShowContextualMenu(Rect rect, List<LeafElement<SettingsInfo>> siblings)
  {
- List<IRenderPipelineGraphicsSettings> targets = new(siblings.Count);
+ List<(IRenderPipelineGraphicsSettings target, SerializedProperty property)> targets = new(siblings.Count);
  foreach (SettingsInfo sibling in siblings)
- targets.Add(sibling.target);
+ targets.Add((sibling.target, sibling.property));
 
  var contextualMenu = new GenericMenu(); //use ImGUI for now, need to be updated later
- RenderPipelineGraphicsSettingsContextMenuManager.PopulateContextMenu(targets, property, ref contextualMenu);
+ RenderPipelineGraphicsSettingsContextMenuManager.PopulateContextMenu(targets, ref contextualMenu);
  contextualMenu.DropDown(new Rect(rect.position + Vector2.up * rect.size.y, Vector2.zero), shouldDiscardMenuOnSecondClick: true);
  }
 
  void DrawContextualMenuButton(VisualElement root, LeafElement<SettingsInfo> settingsInfo)
  {
  var button = new Button(Background.FromTexture2D(EditorGUIUtility.LoadIcon("pane options")));
- button.clicked += () => ShowContextualMenu(button.worldBound, settingsInfo.parent.content, settingsInfo.data.property);
+ button.clicked += () => ShowContextualMenu(button.worldBound, settingsInfo.parent.content);
  root.Add(button);
  }