Unity-Technologies · binary753 · Jul 31, 2019
diff --git a/Editor/Mono/2D/Common/ScriptBindings/SpriteEditorExtension.bindings.cs b/Editor/Mono/2D/Common/ScriptBindings/SpriteEditorExtension.bindings.cs
@@ -3,11 +3,10 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using UnityEngine;
-using UnityEditor;
 using UnityEngine.Bindings;
 using UnityEngine.U2D;
 
-namespace UnityEditor.Experimental.U2D
+namespace UnityEditor.U2D
 {
     [NativeHeader("Editor/Src/2D/SpriteEditorExtension.h")]
     public static class SpriteEditorExtension

diff --git a/Editor/Mono/Animation/AnimationMode.bindings.cs b/Editor/Mono/Animation/AnimationMode.bindings.cs
@@ -181,6 +181,15 @@ internal static void StartAnimationRecording()
         [NativeThrows]
         extern internal static void RevertPropertyModificationsForObject([NotNull] Object target);
 
+        // Returns editor curve bindings for animation clip and animator hierarchy that need to be snapshot for animation mode.
+        extern internal static EditorCurveBinding[] GetAllBindings([NotNull] GameObject root, [NotNull] AnimationClip clip);
+
+        // Returns editor curve bindings for animation clip that need to be snapshot for animation mode.
+        extern internal static EditorCurveBinding[] GetCurveBindings([NotNull] AnimationClip clip);
+
+        // 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 bool Internal_InAnimationMode(Object driver);
 
         extern private static bool Internal_InAnimationModeNoDriver();

diff --git a/Editor/Mono/Animation/AnimationUtility.bindings.cs b/Editor/Mono/Animation/AnimationUtility.bindings.cs
@@ -143,19 +143,13 @@ internal static EditorCurveBinding[] GetAnimatableBindings(ScriptableObject scri
             return Internal_GetScriptableObjectAnimatableBindings(scriptableObject);
         }
 
-        internal static EditorCurveBinding[] GetAdditionalAnimatorBindings(GameObject targetObject)
-        {
-            return Internal_GetAdditionalAnimatorBindings(targetObject);
-        }
-
         internal static EditorCurveBinding[] GetAnimationStreamBindings(GameObject root)
         {
             return Internal_GetAnimationStreamBindings(root);
         }
 
         extern private static EditorCurveBinding[] Internal_GetGameObjectAnimatableBindings([NotNull] GameObject targetObject, [NotNull] GameObject root);
         extern private static EditorCurveBinding[] Internal_GetScriptableObjectAnimatableBindings([NotNull] ScriptableObject scriptableObject);
-        extern private static EditorCurveBinding[] Internal_GetAdditionalAnimatorBindings([NotNull] GameObject targetObject);
         extern private static EditorCurveBinding[] Internal_GetAnimationStreamBindings([NotNull] GameObject root);
 
         // Binds the property and returns the type of the bound value (Can be used to display special UI for it and to enforce correct drag and drop)

diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindow.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindow.cs
@@ -179,9 +179,6 @@ static bool OnOpenAsset(int instanceID, int line)
 
         public bool EditGameObject(GameObject gameObject)
         {
-            if (state.linkedWithSequencer == true)
-                return false;
-
             return EditGameObjectInternal(gameObject, (IAnimationWindowControl)null);
         }
 
@@ -268,6 +265,9 @@ private bool ShouldUpdateGameObjectSelection(GameObjectSelectionItem selectedIte
             if (m_LockTracker.isLocked)
                 return false;
 
+            if (state.linkedWithSequencer)
+                return false;
+
             // Selected game object with no animation player.
             if (selectedItem.rootGameObject == null)
                 return true;

diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs
@@ -304,15 +304,6 @@ private string GetGameObjectName(GameObject rootGameObject, string path)
             return splits[splits.Length - 1];
         }
 
-        private string GetPathWithoutChildmostGameObject(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-                return "";
-
-            int lastIndex = path.LastIndexOf('/');
-            return path.Substring(0, lastIndex + 1);
-        }
-
         private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
         {
             bool curvesChanged = false;

diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs
@@ -900,15 +900,6 @@ public void SelectKey(AnimationWindowKeyframe keyframe)
             m_SelectionBoundsCache = null;
         }
 
-        public void SelectKeysFromDopeline(DopeLine dopeline)
-        {
-            if (dopeline == null)
-                return;
-
-            foreach (var key in dopeline.keys)
-                SelectKey(key);
-        }
-
         public void UnselectKey(AnimationWindowKeyframe keyframe)
         {
             int hash = keyframe.GetHash();
@@ -919,15 +910,6 @@ public void UnselectKey(AnimationWindowKeyframe keyframe)
             m_SelectionBoundsCache = null;
         }
 
-        public void UnselectKeysFromDopeline(DopeLine dopeline)
-        {
-            if (dopeline == null)
-                return;
-
-            foreach (var key in dopeline.keys)
-                UnselectKey(key);
-        }
-
         public void DeleteSelectedKeys()
         {
             if (selectedKeys.Count == 0)
@@ -1546,18 +1528,6 @@ public HashSet<int> GetAffectedHierarchyIDs(List<AnimationWindowKeyframe> keyfra
             return hierarchyIDs;
         }
 
-        public List<DopeLine> GetAffectedDopelines(List<AnimationWindowKeyframe> keyframes)
-        {
-            List<DopeLine> affectedDopelines = new List<DopeLine>();
-
-            foreach (AnimationWindowCurve curve in GetAffectedCurves(keyframes))
-                foreach (DopeLine dopeline in dopelines)
-                    if (!affectedDopelines.Contains(dopeline) && dopeline.curves.Contains(curve))
-                        affectedDopelines.Add(dopeline);
-
-            return affectedDopelines;
-        }
-
         public List<AnimationWindowCurve> GetAffectedCurves(List<AnimationWindowKeyframe> keyframes)
         {
             List<AnimationWindowCurve> affectedCurves = new List<AnimationWindowCurve>();

diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowStyles.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowStyles.cs
@@ -22,7 +22,7 @@ internal class AnimationWindowStyles
         public static GUIContent addKeyframeContent = EditorGUIUtility.TrIconContent("Animation.AddKeyframe", "Add keyframe.");
         public static GUIContent addEventContent = EditorGUIUtility.TrIconContent("Animation.AddEvent", "Add event.");
         public static GUIContent filterBySelectionContent = EditorGUIUtility.TrIconContent("Animation.FilterBySelection", "Filter by selection.");
-        public static GUIContent sequencerLinkContent = EditorGUIUtility.TrIconContent("Animation.SequencerLink", "Animation Window is linked to Sequence Editor.  Press to Unlink.");
+        public static GUIContent sequencerLinkContent = EditorGUIUtility.TrIconContent("Animation.SequencerLink", "Animation Window is linked to Timeline Editor.  Press to Unlink.");
 
         public static GUIContent noAnimatableObjectSelectedText = EditorGUIUtility.TrTextContent("No animatable object selected.");
         public static GUIContent formatIsMissing = EditorGUIUtility.TrTextContent("To begin animating {0}, create {1}.");

diff --git a/Editor/Mono/Animation/AnimationWindow/CurveEditor.cs b/Editor/Mono/Animation/AnimationWindow/CurveEditor.cs
@@ -1326,21 +1326,6 @@ void DragTangents()
             }
         }
 
-        struct KeyFrameCopy
-        {
-            public float time, value, inTangent, outTangent;
-            public int idx, selectionIdx;
-            public KeyFrameCopy(int idx, int selectionIdx, Keyframe source)
-            {
-                this.idx = idx;
-                this.selectionIdx = selectionIdx;
-                time = source.time;
-                value = source.value;
-                inTangent = source.inTangent;
-                outTangent = source.outTangent;
-            }
-        }
-
         internal void DeleteSelectedKeys()
         {
             string undoLabel;
@@ -2882,7 +2867,7 @@ public Vector2 MovePoints()
                         }
 
                         // Curve dragging. Moving keys has highest priority, therefore we check curve/region dragging AFTER key dragging above
-                        if (settings.allowDraggingCurvesAndRegions && m_DraggingKey == null)
+                        if (evt.shift && settings.allowDraggingCurvesAndRegions && m_DraggingKey == null)
                         {
                             // We use the logic as for moving keys when we drag entire curves or regions: We just
                             // select all keyFrames in a curve or region before dragging and ensure to hide tangents when drawing.

diff --git a/Editor/Mono/Animation/AnimationWindow/DopeSheetEditor.cs b/Editor/Mono/Animation/AnimationWindow/DopeSheetEditor.cs
@@ -394,11 +394,6 @@ private void RectangleToolGUI()
             m_RectangleTool.OnGUI();
         }
 
-        private void DrawGrid(Rect position)
-        {
-            TimeRuler(position, state.frameRate, false, true, 0.2f);
-        }
-
         public void DrawMasterDopelineBackground(Rect position)
         {
             if (Event.current.type != EventType.Repaint)

diff --git a/Editor/Mono/Animation/AnimationWindow/DopeSheetEditorRectangleTool.cs b/Editor/Mono/Animation/AnimationWindow/DopeSheetEditorRectangleTool.cs
@@ -3,18 +3,13 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using UnityEngine;
-using UnityEditor;
 using UnityEditorInternal;
-using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace UnityEditor
 {
     internal class DopeSheetEditorRectangleTool : RectangleTool
     {
-        const float kDefaultFrameRate = 60f;
-
         const int kScaleLeftWidth = 17;
         const int kScaleLeftMarginHorizontal = 0;
         const float kScaleLeftMarginVertical = 4;
@@ -382,14 +377,6 @@ private void OnScaleTime(float time)
                 TransformKeys(transform, flipX, false);
         }
 
-        private void OnScaleValue(float val)
-        {
-            Matrix4x4 transform;
-            bool flipY;
-            if (CalculateScaleValueMatrix(m_Previous.y, val, m_MouseOffset.y, m_Pivot.y, out transform, out flipY))
-                TransformKeys(transform, false, flipY);
-        }
-
         private void OnEndScale()
         {
             m_State.EndLiveEdit();

diff --git a/Editor/Mono/Animation/AnimationWindow/RotationCurveInterpolation.cs b/Editor/Mono/Animation/AnimationWindow/RotationCurveInterpolation.cs
@@ -61,11 +61,6 @@ public static State GetCurveState(AnimationClip clip, EditorCurveBinding[] selec
             return state;
         }
 
-        public static int GetCurveIndexFromName(string name)
-        {
-            return ExtractComponentCharacter(name) - 'x';
-        }
-
         public static char ExtractComponentCharacter(string name)
         {
             return name[name.Length - 1];

diff --git a/Editor/Mono/Animation/GameObjectRecorder.bindings.cs b/Editor/Mono/Animation/GameObjectRecorder.bindings.cs
@@ -11,12 +11,30 @@
 
 namespace UnityEditor.Animations
 {
+    public struct CurveFilterOptions
+    {
+        public float positionError;
+        public float rotationError;
+        public float scaleError;
+        public float floatError;
+        public bool keyframeReduction;
+    }
+
     [NativeHeader("Editor/Src/Animation/EditorCurveBinding.bindings.h")]
     [NativeHeader("Editor/Src/Animation/GameObjectRecorder.h")]
     [NativeHeader("Modules/Animation/AnimationClip.h")]
     [NativeType]
     public class GameObjectRecorder : Object
     {
+        readonly static CurveFilterOptions k_DefaultCurveFilterOptions = new CurveFilterOptions()
+        {
+            keyframeReduction = true,
+            positionError = 0.5f,
+            rotationError = 0.5f,
+            scaleError = 0.5f,
+            floatError = 0.5f
+        };
+
         public GameObjectRecorder(GameObject root)
         {
             Internal_Create(this, root);
@@ -76,11 +94,36 @@ public void SaveToClip(AnimationClip clip, float fps)
         {
             if (fps <= Mathf.Epsilon)
                 throw new ArgumentException("FPS can't be 0.0 or less");
-            SaveToClipInternal(clip, fps);
+
+            if (!isRecording)
+                throw new InvalidOperationException("Cannot save to clip as there is nothing to save. The method TakeSnapshot() has not been called.");
+
+            SaveToClipInternal(clip, fps, k_DefaultCurveFilterOptions);
+
+            AnimationUtility.onCurveWasModified?.Invoke(clip, new EditorCurveBinding(), AnimationUtility.CurveModifiedType.ClipModified);
+        }
+
+        public void SaveToClip(AnimationClip clip, float fps, CurveFilterOptions filterOptions)
+        {
+            if (fps <= Mathf.Epsilon)
+                throw new ArgumentException("FPS can't be 0.0 or less");
+
+            if (filterOptions.keyframeReduction)
+            {
+                if (filterOptions.positionError < 0 || filterOptions.rotationError < 0 || filterOptions.scaleError < 0 || filterOptions.floatError < 0)
+                    throw new ArgumentException("Allowed errors for keyframe reduction cannot be negative.");
+            }
+
+            if (!isRecording)
+                throw new InvalidOperationException("Cannot save to clip as there is nothing to save. The method TakeSnapshot() has not been called.");
+
+            SaveToClipInternal(clip, fps, filterOptions);
+
+            AnimationUtility.onCurveWasModified?.Invoke(clip, new EditorCurveBinding(), AnimationUtility.CurveModifiedType.ClipModified);
         }
 
         [NativeMethod("SaveToClip")]
-        extern void SaveToClipInternal(AnimationClip clip, float fps);
+        extern void SaveToClipInternal(AnimationClip clip, float fps, CurveFilterOptions filterOptions);
 
         extern public void ResetRecording();
 

diff --git a/Editor/Mono/Animation/TimeArea.cs b/Editor/Mono/Animation/TimeArea.cs
@@ -137,11 +137,6 @@ public void TimeRuler(Rect position, float frameRate)
             TimeRuler(position, frameRate, true, false, 1f, TimeFormat.TimeFrame);
         }
 
-        public void TimeRuler(Rect position, float frameRate, bool labels, bool useEntireHeight, float alpha)
-        {
-            TimeRuler(position, frameRate, labels, useEntireHeight, alpha, TimeFormat.TimeFrame);
-        }
-
         public void TimeRuler(Rect position, float frameRate, bool labels, bool useEntireHeight, float alpha,
             TimeFormat timeFormat)
         {

diff --git a/Editor/Mono/Annotation/AnnotationUtility.bindings.cs b/Editor/Mono/Annotation/AnnotationUtility.bindings.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
 using System.Runtime.InteropServices;
 using UnityEngine.Bindings;
 
@@ -53,6 +54,8 @@ internal sealed partial class AnnotationUtility
         internal extern static bool use3dGizmos { get; set; }
 
         [StaticAccessor("GetAnnotationManager()", StaticAccessorType.Dot)]
+        // Thomas Tu: 2019-06-20. Will be marked as Obsolete.
+        // We need to deal with code dependency in packages first.
         internal extern static bool showGrid { get; set; }
 
         [StaticAccessor("GetAnnotationManager()", StaticAccessorType.Dot)]

diff --git a/Editor/Mono/Annotation/AnnotationWindow.cs b/Editor/Mono/Annotation/AnnotationWindow.cs
@@ -80,7 +80,6 @@ private enum EnabledState
         GUIContent iconSelectContent = EditorGUIUtility.TrTextContent("", "Select Icon");
 
         GUIContent icon3dGizmoContent = EditorGUIUtility.TrTextContent("3D Icons");
-        GUIContent showGridContent = EditorGUIUtility.TrTextContent("Show Grid");
         GUIContent showOutlineContent = EditorGUIUtility.TrTextContent("Selection Outline");
         GUIContent showWireframeContent = EditorGUIUtility.TrTextContent("Selection Wire");
         private bool m_IsGameView;
@@ -144,7 +143,7 @@ static public void IconChanged()
 
         float GetTopSectionHeight()
         {
-            const int numberOfControls = 4;
+            const int numberOfControls = 3;
             return EditorGUI.kSingleLineHeight * numberOfControls + EditorGUI.kControlVerticalSpacing * numberOfControls;
         }
 
@@ -365,9 +364,6 @@ void DrawTopSection(float topSectionHeight)
             using (new EditorGUI.DisabledScope(m_IsGameView))
             {
                 toggleRect = new Rect(margin, curY, labelWidth, rowHeight);
-                AnnotationUtility.showGrid = GUI.Toggle(toggleRect, AnnotationUtility.showGrid, showGridContent);
-
-                toggleRect.y += rowHeight;
                 AnnotationUtility.showSelectionOutline = GUI.Toggle(toggleRect, AnnotationUtility.showSelectionOutline, showOutlineContent);
 
                 toggleRect.y += rowHeight;
@@ -714,11 +710,6 @@ public AInfo(bool gizmoEnabled, bool iconEnabled, int flags, int classID, string
         public string m_DisplayText;
         public int m_Flags;
 
-        bool IsBitSet(byte b, int pos)
-        {
-            return (b & (1 << pos)) != 0;
-        }
-
         public bool HasGizmo()
         {
             return (m_Flags & (int)Flags.kHasGizmo) > 0;

diff --git a/Editor/Mono/AssemblyHelper.cs b/Editor/Mono/AssemblyHelper.cs
@@ -62,7 +62,7 @@ static public string ExtractInternalAssemblyName(string path)
             }
             catch
             {
-                return ""; // Possible on just deleted FacebookSDK
+                return "";
             }
         }
 

diff --git a/Editor/Mono/AssemblyInfo/AssemblyInfo.cs b/Editor/Mono/AssemblyInfo/AssemblyInfo.cs
@@ -27,6 +27,7 @@
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.UnityAnalytics")]
 [assembly: InternalsVisibleTo("Unity.Timeline.Editor")]
 [assembly: InternalsVisibleTo("Unity.PackageManagerUI.Develop.Editor")]
+[assembly: InternalsVisibleTo("Unity.DeviceSimulator.Editor")]
 
 [assembly: InternalsVisibleTo("Unity.Timeline.EditorTests")]
 [assembly: InternalsVisibleTo("UnityEditor.Graphs")]
@@ -58,7 +59,6 @@
 [assembly: InternalsVisibleTo("UnityEditor.VR")]
 [assembly: InternalsVisibleTo("Unity.RuntimeTests")]
 [assembly: InternalsVisibleTo("Unity.RuntimeTests.Framework")]
-[assembly: InternalsVisibleTo("UnityEditor.Facebook.Extensions")]
 [assembly: InternalsVisibleTo("Assembly-CSharp-Editor-firstpass-testable")]
 [assembly: InternalsVisibleTo("Assembly-CSharp-Editor-testable")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,7 @@ static public string ExtractInternalAssemblyName(string path) @@
                 }
                 catch
                 {
-                    return ""; // Possible on just deleted FacebookSDK
+                    return "";
                 }
             }
@@ Expand Down @@