Skip to content

Commit 4dda402

Browse files
author
Unity Technologies
committed
Unity 2020.2.0a12 C# reference source code
1 parent 59490f1 commit 4dda402

268 files changed

Lines changed: 5762 additions & 3343 deletions

File tree

Some content is hidden

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

‎Editor/Mono/2D/SpriteAtlas/EditorSpriteAtlas.bindings.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ public static class SpriteAtlasExtensions
103103
extern internal static Hash128 GetStoredHash(this SpriteAtlas spriteAtlas);
104104
extern internal static TextureImporterPlatformSettings GetSecondaryPlatformSettings(this SpriteAtlas spriteAtlas, string buildTarget, string secondaryTextureName);
105105
extern internal static void SetSecondaryPlatformSettings(this SpriteAtlas spriteAtlas, TextureImporterPlatformSettings src, string secondaryTextureName);
106+
extern internal static bool GetSecondaryColorSpace(this SpriteAtlas spriteAtlas, string secondaryTextureName);
107+
extern internal static void SetSecondaryColorSpace(this SpriteAtlas spriteAtlas, string secondaryTextureName, bool srGB);
106108
extern internal static void DeleteSecondaryPlatformSettings(this SpriteAtlas spriteAtlas, string secondaryTextureName);
107109
}
108110
}

‎Editor/Mono/2D/SpriteAtlas/SpriteAtlasAsset.bindings.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ public class SpriteAtlasAsset : UnityEngine.Object
4242
extern internal void CopyMasterAtlasSettings();
4343
extern internal TextureImporterPlatformSettings GetSecondaryPlatformSettings(string buildTarget, string secondaryTextureName);
4444
extern internal void SetSecondaryPlatformSettings(TextureImporterPlatformSettings src, string secondaryTextureName);
45+
extern internal bool GetSecondaryColorSpace(string secondaryTextureName);
46+
extern internal void SetSecondaryColorSpace(string secondaryTextureName, bool srGB);
4547
extern internal void DeleteSecondaryPlatformSettings(string secondaryTextureName);
4648
}
4749
};

‎Editor/Mono/2D/SpriteAtlas/SpriteAtlasImporterInspector.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,12 @@ private void HandleTextureSettingUI()
633633
m_HasChanged = true;
634634
}
635635

636+
string secondaryTextureName = m_PlatformSettingsOptions[m_SelectedPlatformSettings];
637+
EditorGUI.BeginChangeCheck();
638+
bool value = EditorGUILayout.Toggle(s_Styles.sRGBLabel, spriteAtlasAsset.GetSecondaryColorSpace(secondaryTextureName));
639+
if (EditorGUI.EndChangeCheck())
640+
spriteAtlasAsset.SetSecondaryColorSpace(secondaryTextureName, value);
641+
636642
HandlePlatformSettingUI(textFieldText);
637643
}
638644
EditorGUILayout.EndVertical();

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,13 @@ private void HandleTextureSettingUI()
556556
}
557557
}
558558

559+
string secondaryTextureName = m_PlatformSettingsOptions[m_SelectedPlatformSettings];
560+
SpriteAtlas sa = (SpriteAtlas)target;
561+
EditorGUI.BeginChangeCheck();
562+
bool value = EditorGUILayout.Toggle(s_Styles.sRGBLabel, sa.GetSecondaryColorSpace(secondaryTextureName));
563+
if (EditorGUI.EndChangeCheck())
564+
sa.SetSecondaryColorSpace(secondaryTextureName, value);
565+
559566
HandlePlatformSettingUI(textFieldText);
560567
}
561568
EditorGUILayout.EndVertical();

‎Editor/Mono/Animation/AnimationUtility.bindings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ public static AnimationCurve GetEditorCurve(AnimationClip clip, string relativeP
383383
}
384384

385385
extern public static AnimationEvent[] GetAnimationEvents([NotNull] AnimationClip clip);
386-
extern public static void SetAnimationEvents([NotNull] AnimationClip clip, [NotNull] AnimationEvent[] events);
386+
[NativeThrows] extern public static void SetAnimationEvents([NotNull] AnimationClip clip, [NotNull] AnimationEvent[] events);
387387

388388
extern public static string CalculateTransformPath([NotNull] Transform targetTransform, Transform root);
389389

‎Editor/Mono/Animation/AnimationWindow/MinMaxCurveEditorWindow.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void InitCurvePresets()
9696
if (m_CurvePresets == null)
9797
{
9898
AnimationCurve max = m_CurveEditor.animationCurves[0].curve;
99-
AnimationCurve min = m_CurveEditor.animationCurves.Length > 1 ? m_CurveEditor.animationCurves[1].curve : null;
99+
AnimationCurve min = m_CurveEditor.animationCurves.Length > 1 ? m_CurveEditor.animationCurves[1].curve : new AnimationCurve();
100100

101101
// Selection callback for library window
102102
System.Action<DoubleCurve> presetSelectedCallback = delegate(DoubleCurve presetCurve)
@@ -110,6 +110,9 @@ void InitCurvePresets()
110110
doubleCurve.maxCurve.postWrapMode = presetCurve.maxCurve.postWrapMode;
111111
doubleCurve.maxCurve.preWrapMode = presetCurve.maxCurve.preWrapMode;
112112

113+
m_MinCurve = doubleCurve.minCurve;
114+
m_MaxCurve = doubleCurve.maxCurve;
115+
113116
m_CurveEditor.SelectNone();
114117
RefreshShownCurves();
115118
SendEvent("CurveChanged", true);

‎Editor/Mono/AnimatorController.bindings.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ extern public AnimatorControllerLayer[] layers
3232
{
3333
[FreeFunction(Name = "AnimatorControllerBindings::GetLayers", HasExplicitThis = true)]
3434
get;
35-
[FreeFunction(Name = "AnimatorControllerBindings::SetLayers", HasExplicitThis = true)]
35+
[FreeFunction(Name = "AnimatorControllerBindings::SetLayers", HasExplicitThis = true, ThrowsException = true)]
3636
set;
3737
}
3838

3939
extern public AnimatorControllerParameter[] parameters
4040
{
4141
[FreeFunction(Name = "AnimatorControllerBindings::GetParameters", HasExplicitThis = true)]
4242
get;
43-
[FreeFunction(Name = "AnimatorControllerBindings::SetParameters", HasExplicitThis = true)]
43+
[FreeFunction(Name = "AnimatorControllerBindings::SetParameters", HasExplicitThis = true, ThrowsException = true)]
4444
set;
4545
}
4646

‎Editor/Mono/AssemblyValidation.cs‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System;
66
using System.Collections.Generic;
77
using System.Globalization;
8+
using System.IO;
89
using System.Runtime.InteropServices;
910
using Mono.Cecil;
1011
using UnityEditor.Scripting.ScriptCompilation;
@@ -392,10 +393,11 @@ public static void ResolveAndSetupReferences(int index,
392393
if (isSigned)
393394
{
394395
var definition = assemblyDefinitions[referenceAssemblyDefinitionIndex];
395-
if (definition.Name.Version.ToString() != reference.Version.ToString())
396+
397+
if (definition.Name.Version.ToString() != reference.Version.ToString() && !IsInSameFolder(assemblyDefinition, referenceAssemblyDefinition))
396398
{
397399
errors[index].Add(ErrorFlags.UnresolvableReference,
398-
$"{assemblyDefinition.Name.Name} references strong named {reference.Name}, versions has to match. Assembly references: {reference.Version} Found in project: {definition.Name.Version}.");
400+
$"{assemblyDefinition.Name.Name} references strong named {reference.Name} in a different folder, versions has to match. Assembly references: {reference.Version} Found in project: {definition.Name.Version}.");
399401
}
400402
}
401403

@@ -413,6 +415,13 @@ public static void ResolveAndSetupReferences(int index,
413415
assemblyAndReferences[index].referenceIndicies = referenceIndieces.ToArray();
414416
}
415417

418+
private static bool IsInSameFolder(AssemblyDefinition first, AssemblyDefinition second)
419+
{
420+
var firstAssemblyPath = Path.GetDirectoryName(first.MainModule.FileName);
421+
var secondAssemblyPath = Path.GetDirectoryName(second.MainModule.FileName);
422+
return firstAssemblyPath.Equals(secondAssemblyPath, StringComparison.Ordinal);
423+
}
424+
416425
private static bool IsSigned(AssemblyNameReference reference)
417426
{
418427
//Bug in Cecil where HasPublicKey is always false

‎Editor/Mono/AssetDatabase/AssetDatabase.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ private static void Internal_CallImportPackageFailed(string packageName, string
6868
importPackageFailed(packageName, errorMessage);
6969
}
7070

71+
[RequiredByNativeCode]
72+
private static bool Internal_IsOpenForEdit(string assetOrMetaFilePath)
73+
{
74+
return IsOpenForEdit(assetOrMetaFilePath);
75+
}
76+
7177
public static void IsOpenForEdit(string[] assetOrMetaFilePaths, List<string> outNotEditablePaths, [uei.DefaultValue("StatusQueryOptions.UseCachedIfPossible")] StatusQueryOptions statusQueryOptions = StatusQueryOptions.UseCachedIfPossible)
7278
{
7379
if (assetOrMetaFilePaths == null)
@@ -79,13 +85,25 @@ public static void IsOpenForEdit(string[] assetOrMetaFilePaths, List<string> out
7985
UnityEngine.Profiling.Profiler.EndSample();
8086
}
8187

88+
[RequiredByNativeCode]
89+
private static bool Internal_MakeEditable(string path)
90+
{
91+
return MakeEditable(path);
92+
}
93+
8294
public static bool MakeEditable(string path)
8395
{
8496
if (path == null)
8597
throw new ArgumentNullException(nameof(path));
8698
return MakeEditable(new[] {path});
8799
}
88100

101+
[RequiredByNativeCode]
102+
private static bool Internal_MakeEditable2(string[] paths, string prompt = null, List<string> outNotEditablePaths = null)
103+
{
104+
return MakeEditable(paths, prompt, outNotEditablePaths);
105+
}
106+
89107
public static bool MakeEditable(string[] paths, string prompt = null, List<string> outNotEditablePaths = null)
90108
{
91109
if (paths == null)

‎Editor/Mono/AssetPipeline/TextureImporter.bindings.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,6 @@ public void SetTextureSettings(TextureImporterSettings src)
422422
[NativeName("GetImportInspectorWarning")]
423423
internal extern string GetImportWarnings();
424424

425-
// Read texture import instructions into [[TextureImportInstructions]] class.
426425
public extern void ReadTextureImportInstructions(BuildTarget target, out TextureFormat desiredFormat, out ColorSpace colorSpace, out int compressionQuality);
427426

428427
// This is pure backward compatibility codepath. It can be removed when we decide that the time has come

0 commit comments

Comments
 (0)