Unity 2020.1.0a9 C# reference source code

Author: Unity Technologies

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

@@ -194,7 +194,7 @@ void OnEnable()
             m_VariantScale = serializedObject.FindProperty("m_EditorData.variantMultiplier");
 
             m_Packables = serializedObject.FindProperty("m_EditorData.packables");
-            m_PackableList = new ReorderableList(serializedObject, m_Packables, true, true, true, true);
+            m_PackableList = new ReorderableList(serializedObject, m_Packables, true, false, true, true);
             m_PackableList.onAddCallback = AddPackable;
             m_PackableList.onRemoveCallback = RemovePackable;
             m_PackableList.drawElementCallback = DrawPackableElement;

Editor/Mono/Animation/AnimationMode.bindings.cs

@@ -13,7 +13,7 @@
 
 namespace UnityEditor
 {
-    internal class AnimationModeDriver : ScriptableObject
+    public class AnimationModeDriver : ScriptableObject
     {
         internal delegate bool IsKeyCallback(Object target, string propertyPath);
 
@@ -65,11 +65,14 @@ static private AnimationModeDriver DummyDriver()
         // Stops animation mode, as used by the animation editor.
         public static void StopAnimationMode()
         {
-            StopAnimationMode(DummyDriver());
+            Internal_StopAnimationMode(DummyDriver());
         }
 
         // Stops animation mode, as used by the animation editor.
-        extern internal static void StopAnimationMode(Object driver);
+        public static void StopAnimationMode(AnimationModeDriver driver)
+        {
+            Internal_StopAnimationMode(driver);
+        }
 
         // Returns true if the editor is currently in animation mode.
         public static bool InAnimationMode()
@@ -78,19 +81,22 @@ public static bool InAnimationMode()
         }
 
         // Returns true if the editor is currently in animation mode.
-        internal static bool InAnimationMode(Object driver)
+        public static bool InAnimationMode(AnimationModeDriver driver)
         {
             return Internal_InAnimationMode(driver);
         }
 
         // Starts animation mode, as used by the animation editor.
         public static void StartAnimationMode()
         {
-            StartAnimationMode(DummyDriver());
+            Internal_StartAnimationMode(DummyDriver());
         }
 
         // Starts animation mode, as used by the animation editor.
-        extern internal static void StartAnimationMode(Object driver);
+        public static void StartAnimationMode(AnimationModeDriver driver)
+        {
+            Internal_StartAnimationMode(driver);
+        }
 
         // Stops animation playback mode, as used by the animation editor.
         internal static void StopAnimationPlaybackMode()
@@ -129,8 +135,10 @@ internal static void StartAnimationRecording()
             onAnimationRecordingStart?.Invoke();
         }
 
-        [NativeThrows]
-        extern internal static void StartCandidateRecording(Object driver);
+        internal static void StartCandidateRecording(AnimationModeDriver driver)
+        {
+            Internal_StartCandidateRecording(driver);
+        }
 
         [NativeThrows]
         extern internal static void AddCandidate(EditorCurveBinding binding, PropertyModification modification, bool keepPrefabOverride);
@@ -155,7 +163,7 @@ internal static void StartAnimationRecording()
         extern internal static void SampleCandidateClip([NotNull] GameObject gameObject, [NotNull] AnimationClip clip, float time);
 
         [NativeThrows]
-        extern internal static void SamplePlayableGraph([NotNull] GameObject gameObject, PlayableGraph graph, int index, float time);
+        extern public static void SamplePlayableGraph(PlayableGraph graph, int index, float time);
 
         [NativeThrows]
         extern public static void AddPropertyModification(EditorCurveBinding binding, PropertyModification modification, bool keepPrefabOverride);
@@ -190,8 +198,15 @@ internal static void StartAnimationRecording()
         // Return editor curve bindings for animator hierarhcy that need to be snapshot for animation mode.
         extern internal static EditorCurveBinding[] GetAnimatorBindings([NotNull] GameObject root);
 
+        extern private static void Internal_StartAnimationMode(Object driver);
+
+        extern private static void Internal_StopAnimationMode(Object driver);
+
         extern private static bool Internal_InAnimationMode(Object driver);
 
         extern private static bool Internal_InAnimationModeNoDriver();
+
+        [NativeThrows]
+        extern private static void Internal_StartCandidateRecording(Object driver);
     }
 }

Editor/Mono/Animation/AnimationWindow/AnimEditor.cs

@@ -575,7 +575,7 @@ private void FrameRateInputFieldOnGUI()
 
             using (new EditorGUI.DisabledScope(!selection.animationIsEditable))
             {
-                GUILayout.Label(AnimationWindowStyles.samples, EditorStyles.miniLabel);
+                GUILayout.Label(AnimationWindowStyles.samples, EditorStyles.toolbarLabel);
 
                 EditorGUI.BeginChangeCheck();
                 int clipFrameRate = EditorGUILayout.DelayedIntField((int)m_State.clipFrameRate, EditorStyles.toolbarTextField, GUILayout.Width(kIntFieldWidth));

Editor/Mono/Animation/AnimationWindow/AnimationWindowControl.cs

@@ -676,7 +676,7 @@ private void ResampleAnimation(ResampleFlags flags)
 
                     m_ClipPlayable.SetSampleRate(playing ? -1 : state.activeAnimationClip.frameRate);
 
-                    AnimationMode.SamplePlayableGraph(state.activeRootGameObject, m_Graph, 0, time.time);
+                    AnimationMode.SamplePlayableGraph(m_Graph, 0, time.time);
 
                     // This will cover euler/quaternion matching in basic playable graphs only (animation clip + candidate clip).
                     AnimationUtility.SampleEulerHint(state.activeRootGameObject, state.activeAnimationClip, time.time, WrapMode.Clamp);

Editor/Mono/Annotation/SceneRenderModeWindow.cs

@@ -167,7 +167,7 @@ private float windowHeight
                     modes = Styles.sBuiltinCameraModes.Length + SceneView.userDefinedModes.Count(mode => m_SceneView.IsCameraDrawModeEnabled(mode));
                 }
 
-                int separators = headers - 2;
+                int separators = headers - 1;
                 return ((headers + modes) * EditorGUI.kSingleLineHeight) + (kSeparatorHeight * separators) + kShowLightmapResolutionHeight;
             }
         }

Editor/Mono/AssetModificationProcessor.cs

@@ -127,6 +127,12 @@ static void FileModeChanged(string[] assets, UnityEditor.VersionControl.FileMode
             if (!Provider.enabled)
                 return;
 
+            // if we happen to be disconnected or work offline, there's not much we can do;
+            // just ignore the file mode and hope that VCS client/project is setup to handle
+            // appropriate file types correctly
+            if (!Provider.isActive)
+                return;
+
             // we'll want to re-serialize these assets in different (text vs binary) mode;
             // make sure they are editable first
             AssetDatabase.MakeEditable(assets);

Editor/Mono/EditorGUI.cs

@@ -1734,10 +1734,13 @@ internal static string ToolbarSearchField(int id, Rect position, string[] search
             {
                 using (new DisabledScope(true))
                 {
-                    var placeHolderTextRect = position;
+                    var placeHolderTextRect = EditorStyles.toolbarSearchFieldPopup.padding.Remove(new Rect(position.x, position.y, position.width
+                        , EditorStyles.toolbarSearchFieldPopup.fixedHeight > 0 ? EditorStyles.toolbarSearchFieldPopup.fixedHeight : position.height));
+                    var oldFontSize = EditorStyles.label.fontSize;
 
-                    placeHolderTextRect.xMin += EditorStyles.toolbarSearchFieldPopup.padding.right;
+                    EditorStyles.label.fontSize = EditorStyles.toolbarSearchFieldPopup.fontSize;
                     EditorStyles.label.Draw(placeHolderTextRect, EditorGUIUtility.TempContent(searchModes[searchMode]), false, false, false, false);
+                    EditorStyles.label.fontSize = oldFontSize;
                 }
             }
 
@@ -5302,6 +5305,12 @@ internal static bool HelpIconButton(Rect position, Object[] objs)
             bool hasHelp = Help.HasHelpForObject(obj, monoBehaviourFallback);
             if (hasHelp || isDevBuild)
             {
+                // Help button should not be disabled at any time. For example VCS system disables
+                // inspectors and it wouldn't make sense to prevent users from getting help because
+                // he didn't check out the file yet.
+                bool wasEditorDisabled = GUI.enabled;
+                GUI.enabled = true;
+
                 Color oldColor = GUI.color;
                 GUIContent content = new GUIContent(GUIContents.helpIcon);
                 string helpTopic = Help.GetNiceHelpNameForObject(obj, monoBehaviourFallback);
@@ -5328,6 +5337,8 @@ internal static bool HelpIconButton(Rect position, Object[] objs)
                 }
 
                 GUI.color = oldColor;
+                GUI.enabled = wasEditorDisabled;
+
                 return true;
             }
             return false;

Editor/Mono/EditorSceneManager.bindings.cs

@@ -197,13 +197,14 @@ public extern static SceneAsset playModeStartScene
         [StaticAccessor("GetSceneManager()", StaticAccessorType.Dot)]
         extern public static ulong CalculateAvailableSceneCullingMask();
 
-        // Ensure in sync with kDefaultSceneCullingMask in C++ (it needs to match DefaultSceneCullingMask bits)
-        public const ulong DefaultSceneCullingMask = SceneCullingMasks.GameViewObjects | SceneCullingMasks.MainStageSceneViewObjects;
+        // Use SceneCullingMasks.DefaultSceneCullingMask
+        public const ulong DefaultSceneCullingMask = SceneCullingMasks.DefaultSceneCullingMask;
     }
 
     public static class SceneCullingMasks
     {
-        // If updating the bits here ensure kDefaultSceneCullingMask (in C++) is in sync with EditorSceneManager.DefaultSceneCullingMask
+        // If updating the bits here ensure kDefaultSceneCullingMask (in C++) is in sync. Also ensure EditorSceneManager.DefaultSceneCullingMask is in sync.
+        public const ulong DefaultSceneCullingMask = GameViewObjects | MainStageSceneViewObjects;
         public const ulong GameViewObjects = 1UL << 63;
         public const ulong MainStageSceneViewObjects = MainStagePrefabInstanceObjectsOpenInPrefabMode | MainStageExcludingPrefabInstanceObjectsOpenInPrefabMode;
 

Editor/Mono/EditorSettings.bindings.cs

@@ -40,6 +40,19 @@ public enum LineEndingsMode
         Windows = 2
     }
 
+    public enum AssetPipelineMode
+    {
+        Version1 = 0,
+        Version2 = 1
+    }
+
+    public enum CacheServerMode
+    {
+        AsPreferences = 0,
+        Enabled = 1,
+        Disabled = 2
+    }
+
     [Flags]
     public enum EnterPlayModeOptions
     {
@@ -237,5 +250,23 @@ internal static extern string Internal_ProjectGenerationUserExtensions
 
         [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
         public static extern EnterPlayModeOptions enterPlayModeOptions { get; set; }
+
+        [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
+        public static extern AssetPipelineMode assetPipelineMode { get; set; }
+
+        [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
+        public static extern CacheServerMode cacheServerMode { get; set; }
+
+        [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
+        public static extern string cacheServerEndpoint { get; set; }
+
+        [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
+        public static extern string cacheServerNamespacePrefix { get; set; }
+
+        [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
+        public static extern bool cacheServerEnableDownload { get; set; }
+
+        [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
+        public static extern bool cacheServerEnableUpload { get; set; }
     }
 }

Editor/Mono/EditorUserBuildSettings.bindings.cs

@@ -409,6 +409,8 @@ public static extern AndroidETC2Fallback androidETC2Fallback
         [Obsolete("androidUseLegacySdkTools has been deprecated. It does not have any effect.")]
         public static extern bool androidUseLegacySdkTools { get; set; }
 
+        public static extern bool androidCreateSymbolsZip { get; set; }
+
         // *undocumented*
         // NOTE: This setting should probably not be a part of the public API as is. Atm it is used by playmode tests
         //  and applied during build post-processing. We will however move towards separating building and launching