Skip to content

Commit 496f7d6

Browse files
author
Unity Technologies
committed
Unity 2023.3.0a17 C# reference source code
1 parent b7836ef commit 496f7d6

File tree

130 files changed

+7096
-376
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+7096
-376
lines changed

Editor/Mono/Animation/AnimationUtility.bindings.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,15 @@ internal enum PolynomialValid
8181
TooManySegments = 3
8282
}
8383

84+
internal enum DiscreteBindingResult
85+
{
86+
Valid = 0,
87+
InvalidScript = 1,
88+
MissingField = 2,
89+
IncompatibleFieldType = 3,
90+
MissingDiscreteAttribute = 4
91+
}
92+
8493
public delegate void OnCurveWasModified(AnimationClip clip, EditorCurveBinding binding, CurveModifiedType type);
8594
public static OnCurveWasModified onCurveWasModified;
8695

@@ -270,7 +279,7 @@ internal static void SetEditorCurveNoSync(AnimationClip clip, EditorCurveBinding
270279
[NativeThrows]
271280
extern private static void Internal_SetEditorCurve([NotNull] AnimationClip clip, EditorCurveBinding binding, AnimationCurve curve, bool syncEditorCurves);
272281

273-
extern internal static bool IsDiscreteIntBinding(EditorCurveBinding binding);
282+
extern internal static DiscreteBindingResult IsDiscreteIntBinding(EditorCurveBinding binding);
274283

275284
extern internal static void SyncEditorCurves([NotNull] AnimationClip clip);
276285

Editor/Mono/Animation/EditorCurveBinding.bindings.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using UnityEngine.Scripting.APIUpdating;
1010
using UnityEngine.Internal;
1111
using UnityEngine;
12+
using static UnityEditor.AnimationUtility;
1213

1314
namespace UnityEditor
1415
{
@@ -129,7 +130,8 @@ static public EditorCurveBinding DiscreteCurve(string inPath, System.Type inType
129130
binding.m_isSerializeReferenceCurve = 0;
130131
binding.m_isUnknownCurve = 0;
131132

132-
if (!AnimationUtility.IsDiscreteIntBinding(binding))
133+
DiscreteBindingResult result = AnimationUtility.IsDiscreteIntBinding(binding);
134+
if (result == DiscreteBindingResult.IncompatibleFieldType || result == DiscreteBindingResult.MissingDiscreteAttribute)
133135
{
134136
Debug.LogWarning(
135137
$"Property [" + inPropertyName + "] is not a supported discrete curve binding. " +

Editor/Mono/AssetPipeline/AssetImportContext.bindings.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ public string GetArtifactFilePath(GUID guid, string fileName)
116116
[NativeName("DependsOnImportedAsset")]
117117
private extern void DependsOnImportedAssetInternal(string path);
118118

119+
public extern Object GetReferenceToAssetMainObject(string path);
120+
119121
public void DependsOnArtifact(ArtifactKey key)
120122
{
121123
if (!key.isValid)

Editor/Mono/AssetPipeline/AssetImporter.bindings.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ public static ImportLog GetImportLog(string path)
107107
[NativeName("SetAssetBundleName")]
108108
extern public void SetAssetBundleNameAndVariant(string assetBundleName, string assetBundleVariant);
109109

110+
[NativeMethod("SetThumbnailFromTexture2D")]
111+
extern internal void SetThumbnailFromTexture2D(Texture2D image, int instanceID);
112+
110113
[FreeFunction("FindAssetImporterAtAssetPath")]
111114
extern public static AssetImporter GetAtPath(string path);
112115

0 commit comments

Comments
 (0)