Unity 2022.1.0a11 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/MaterialAnimationUtility.cs

@@ -63,16 +63,17 @@ static PropertyModification[] MaterialPropertyToPropertyModifications(string nam
             return modifications;
         }
 
-        static bool ApplyMaterialModificationToAnimationRecording(PropertyModification[] modifications)
+        static bool ApplyMaterialModificationToAnimationRecording(PropertyModification[] previousModifications, PropertyModification[] currentModifications)
         {
-            UndoPropertyModification[] undoModifications = new UndoPropertyModification[modifications.Length];
+            UndoPropertyModification[] undoModifications = new UndoPropertyModification[previousModifications.Length];
             for (int i = 0; i < undoModifications.Length; ++i)
             {
-                undoModifications[i].previousValue = modifications[i];
+                undoModifications[i].previousValue = previousModifications[i];
+                undoModifications[i].currentValue = currentModifications[i];
             }
 
             UndoPropertyModification[] ret = Undo.InvokePostprocessModifications(undoModifications);
-            return ret.Length != modifications.Length;
+            return ret.Length != undoModifications.Length;
         }
 
         static public bool OverridePropertyColor(MaterialProperty materialProp, Renderer target, out Color color)
@@ -141,22 +142,22 @@ static public bool ApplyMaterialModificationToAnimationRecording(MaterialPropert
             {
                 case MaterialProperty.PropType.Color:
                     SetupMaterialPropertyBlock(materialProp, changedMask, target);
-                    applied = ApplyMaterialModificationToAnimationRecording(MaterialPropertyToPropertyModifications(materialProp, target, (Color)oldValue));
+                    applied = ApplyMaterialModificationToAnimationRecording(MaterialPropertyToPropertyModifications(materialProp, target, (Color)oldValue), MaterialPropertyToPropertyModifications(materialProp, target, materialProp.colorValue));
                     if (!applied)
                         TearDownMaterialPropertyBlock(target);
                     return applied;
 
                 case MaterialProperty.PropType.Vector:
                     SetupMaterialPropertyBlock(materialProp, changedMask, target);
-                    applied = ApplyMaterialModificationToAnimationRecording(MaterialPropertyToPropertyModifications(materialProp, target, (Vector4)oldValue));
+                    applied = ApplyMaterialModificationToAnimationRecording(MaterialPropertyToPropertyModifications(materialProp, target, (Vector4)oldValue), MaterialPropertyToPropertyModifications(materialProp, target, materialProp.vectorValue));
                     if (!applied)
                         TearDownMaterialPropertyBlock(target);
                     return applied;
 
                 case MaterialProperty.PropType.Float:
                 case MaterialProperty.PropType.Range:
                     SetupMaterialPropertyBlock(materialProp, changedMask, target);
-                    applied = ApplyMaterialModificationToAnimationRecording(MaterialPropertyToPropertyModifications(materialProp, target, (float)oldValue));
+                    applied = ApplyMaterialModificationToAnimationRecording(MaterialPropertyToPropertyModifications(materialProp, target, (float)oldValue), MaterialPropertyToPropertyModifications(materialProp, target, materialProp.floatValue));
                     if (!applied)
                         TearDownMaterialPropertyBlock(target);
                     return applied;
@@ -167,7 +168,7 @@ static public bool ApplyMaterialModificationToAnimationRecording(MaterialPropert
                     {
                         string name = materialProp.name + "_ST";
                         SetupMaterialPropertyBlock(materialProp, changedMask, target);
-                        applied = ApplyMaterialModificationToAnimationRecording(MaterialPropertyToPropertyModifications(name, target, (Vector4)oldValue));
+                        applied = ApplyMaterialModificationToAnimationRecording(MaterialPropertyToPropertyModifications(name, target, (Vector4)oldValue), MaterialPropertyToPropertyModifications(name, target, materialProp.textureScaleAndOffset));
                         if (!applied)
                             TearDownMaterialPropertyBlock(target);
                         return applied;

Editor/Mono/Annotation/AnnotationUtility.bindings.cs

@@ -3,13 +3,12 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
-using System.Runtime.InteropServices;
 using UnityEngine.Bindings;
 
 namespace UnityEditor
 {
     [NativeType(CodegenOptions.Custom, "AnnotationBindings")]
-    internal partial struct Annotation
+    struct Annotation
     {
         public int iconEnabled;
         public int gizmoEnabled;
@@ -20,12 +19,22 @@ internal partial struct Annotation
 
     [NativeHeader("Editor/Mono/Annotation/AnnotationUtility.bindings.h")]
     [NativeHeader("Editor/Src/AnnotationManager.h")]
-    internal sealed partial class AnnotationUtility
+    static class AnnotationUtility
     {
+        // Similar values as in Annotation (in AnnotationManager.h)
+        public enum Flags
+        {
+            kHasIcon = 1 << 0,
+            kHasGizmo = 1 << 1,
+            kIsDisabled = 1 << 2
+        };
+
         extern internal static  Annotation[] GetAnnotations();
 
         extern internal static  Annotation[] GetRecentlyChangedAnnotations();
 
+        extern internal static Annotation GetAnnotation(int classID, string scriptClass);
+
         [StaticAccessor("GetAnnotationManager()", StaticAccessorType.Dot)]
         extern internal static  string GetNameOfCurrentSetup();