Skip to content

Commit e5f4317

Browse files
author
Unity Technologies
committed
Unity 2020.1.0a19 C# reference source code
1 parent d09d3f5 commit e5f4317

File tree

183 files changed

+5333
-6988
lines changed

Some content is hidden

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

183 files changed

+5333
-6988
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,6 @@ public static class SpriteAtlasExtensions
9595
extern internal static Texture2D[] GetPreviewAlphaTextures(this SpriteAtlas spriteAtlas);
9696
extern internal static TextureFormat GetTextureFormat(this SpriteAtlas spriteAtlas, BuildTarget target);
9797
extern internal static Sprite[] GetPackedSprites(this SpriteAtlas spriteAtlas);
98+
extern internal static Hash128 GetStoredHash(this SpriteAtlas spriteAtlas);
9899
}
99100
}

‎Editor/Mono/AssetStore/AssetStoreAssetSelection.cs

Lines changed: 0 additions & 298 deletions
This file was deleted.

‎Editor/Mono/AssetStore/AssetStoreContext.cs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,6 @@
1616

1717
namespace UnityEditor
1818
{
19-
/// <summary>
20-
/// The interface of this class is mirrored into the browser's JavaScript world as
21-
/// "window.context".
22-
/// </summary>
23-
/// <remarks>
24-
/// The WebView will expose the methods of this class as functions on the JavaScript
25-
/// object created by AssetStoreWindow.SetContextObject(). Return values and arguments
26-
/// of these methods can be any primitive type, arrays of any other valid type, and
27-
/// classes with public fields of any other valid type. In the last case, objects of
28-
/// these classes will be translate to and from JavaScript objects with C# fields mapping
29-
/// to JavaScript properties.
30-
/// </remarks>
3119
[InitializeOnLoad]
3220
internal partial class AssetStoreContext
3321
{
@@ -41,7 +29,6 @@ public static AssetStoreContext GetInstance()
4129
if (s_Instance == null)
4230
{
4331
s_Instance = new AssetStoreContext();
44-
JSProxyMgr.GetInstance().AddGlobalObject("AssetStoreContext", s_Instance);
4532
}
4633

4734
return s_Instance;
@@ -116,11 +103,6 @@ public int GetSkinIndex()
116103
return EditorGUIUtility.skinIndex;
117104
}
118105

119-
public bool GetDockedStatus()
120-
{
121-
return docked;
122-
}
123-
124106
public bool OpenPackage(string id)
125107
{
126108
return OpenPackage(id, "default");
@@ -316,7 +298,6 @@ private bool IsBuiltinStandardAsset(string path)
316298
private static Regex s_GeneratedIDRegExp = new Regex(@"^\{(.*)\}$");
317299
private static Regex s_InvalidPathCharsRegExp = new Regex(@"[^a-zA-Z0-9() _-]");
318300

319-
internal bool docked;
320301
internal string initialOpenURL;
321302

322303
private static AssetStoreContext s_Instance;

0 commit comments

Comments
 (0)