Skip to content

Commit 11ba547

Browse files
author
Unity Technologies
committed
Unity 2020.2.0a17 C# reference source code
1 parent f8fe858 commit 11ba547

File tree

123 files changed

+1611
-516
lines changed

Some content is hidden

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

123 files changed

+1611
-516
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Collections.Generic;
77
using System.ComponentModel;
88
using UnityEditor.Build;
9-
using UnityEditor.Experimental.AssetImporters;
9+
using UnityEditor.AssetImporters;
1010
using UnityEngine;
1111
using UnityEngine.Bindings;
1212
using UnityEngine.Scripting;

Editor/Mono/2D/SpriteAtlas/SpriteAtlasImporter.bindings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Collections.Generic;
77
using System.ComponentModel;
88
using UnityEditor.Build;
9-
using UnityEditor.Experimental.AssetImporters;
9+
using UnityEditor.AssetImporters;
1010
using UnityEngine;
1111
using UnityEngine.Bindings;
1212
using UnityEngine.Scripting;

Editor/Mono/AssetPipeline/AssetImportContext.bindings.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
using UnityEngine;
99
using UnityEngine.Bindings;
1010
using UnityEngine.Scripting;
11+
using UnityEngine.Scripting.APIUpdating;
1112
using Debug = UnityEngine.Debug;
1213
using Object = UnityEngine.Object;
14+
using UnityEditor.Experimental;
1315

14-
15-
namespace UnityEditor.Experimental.AssetImporters
16+
namespace UnityEditor.AssetImporters
1617
{
1718
/// Universal structure that holds all the data relevant to importing an asset, including temporary data that needs to be shared across stages that make on any given importer's pipeline.
1819
///
@@ -21,6 +22,7 @@ namespace UnityEditor.Experimental.AssetImporters
2122
/// various parts that make up an importers pipeline. This container simply transports information from one "stage" to the other. Each stage is free to add/delete/alter the content of the container
2223
[RequiredByNativeCode]
2324
[NativeHeader("Editor/Src/AssetPipeline/AssetImportContext.h")]
25+
[MovedFrom("UnityEditor.Experimental.AssetImporters")]
2426
public class AssetImportContext
2527
{
2628
// The bindings generator is setting the instance pointer in this field

Editor/Mono/AssetPipeline/TextureGenerator.bindings.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
using System.Collections.Generic;
1010
using Unity.Collections;
1111
using Unity.Collections.LowLevel.Unsafe;
12+
using UnityEngine.Scripting.APIUpdating;
1213

13-
namespace UnityEditor.Experimental.AssetImporters
14+
namespace UnityEditor.AssetImporters
1415
{
1516
[StructLayout(LayoutKind.Sequential)]
17+
[MovedFrom("UnityEditor.Experimental.AssetImporters")]
1618
public struct SpriteImportData
1719
{
1820
private string m_Name;
@@ -35,6 +37,7 @@ public struct SpriteImportData
3537
}
3638

3739
[StructLayout(LayoutKind.Sequential)]
40+
[MovedFrom("UnityEditor.Experimental.AssetImporters")]
3841
public struct TextureGenerationOutput
3942
{
4043
[NativeName("texture")]
@@ -58,6 +61,7 @@ public struct TextureGenerationOutput
5861

5962
[StructLayout(LayoutKind.Sequential)]
6063
[NativeAsStruct]
64+
[MovedFrom("UnityEditor.Experimental.AssetImporters")]
6165
public class SourceTextureInformation
6266
{
6367
[NativeName("width")]
@@ -76,6 +80,7 @@ public class SourceTextureInformation
7680
}
7781

7882
[StructLayout(LayoutKind.Sequential)]
83+
[MovedFrom("UnityEditor.Experimental.AssetImporters")]
7984
public struct TextureGenerationSettings
8085
{
8186
[NativeName("assetPath")]
@@ -227,6 +232,7 @@ public TextureGenerationSettings(TextureImporterType type)
227232
[NativeHeader("Editor/Src/AssetPipeline/TextureImporting/TextureImporterTypes.h")]
228233
[NativeHeader("Editor/Src/AssetPipeline/TextureImporting/TextureImporter.bindings.h")]
229234
[NativeHeader("Runtime/Serialize/BuildTarget.h")]
235+
[MovedFrom("UnityEditor.Experimental.AssetImporters")]
230236
public static unsafe class TextureGenerator
231237
{
232238
public static TextureGenerationOutput GenerateTexture(TextureGenerationSettings settings, NativeArray<Color32> colorBuffer)

Editor/Mono/AssetPipeline/TextureImporter.bindings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Collections.Generic;
77
using System.ComponentModel;
88
using UnityEditor.Build;
9-
using UnityEditor.Experimental.AssetImporters;
9+
using UnityEditor.AssetImporters;
1010
using UnityEngine;
1111
using UnityEngine.Bindings;
1212
using UnityEngine.Scripting;

Editor/Mono/AssetPostprocessor.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using System.Reflection;
1414
using UnityEditor.AssetImporters;
1515
using Object = UnityEngine.Object;
16-
using UnityEditor.Experimental.AssetImporters;
1716
using UnityEditorInternal;
1817
using Unity.CodeEditor;
1918
using UnityEditor.Profiling;

Editor/Mono/BuildPipeline/DesktopStandalonePostProcessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ private void ProcessIl2CppOutputForSolution(BuildPostProcessArgs args, IIl2CppPl
301301
FileUtil.MoveFileOrDirectory(args.stagingAreaDataManaged, Paths.Combine(args.stagingArea, projectName, "Managed"));
302302

303303
// Move il2cpp data
304-
var il2cppOutputPath = IL2CPPBuilder.GetCppOutputPath(args.stagingAreaData);
304+
var il2cppOutputPath = IL2CPPBuilder.GetCppOutputDirectory(args.stagingAreaData);
305305
var il2cppDataSource = Path.Combine(il2cppOutputPath, "Data");
306306
var il2cppDataTarget = Path.Combine(args.stagingAreaData, "il2cpp_data");
307307

Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs

Lines changed: 106 additions & 53 deletions
Large diffs are not rendered by default.

Editor/Mono/CollectImportedDependenciesAttribute.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
using System.Reflection;
99
using UnityEngine.Scripting;
1010
using static UnityEditor.AttributeHelper;
11+
using UnityEngine.Scripting.APIUpdating;
1112

12-
namespace UnityEditor.Experimental.AssetImporters
13+
namespace UnityEditor.AssetImporters
1314
{
1415
[RequiredByNativeCode]
1516
[AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = true)]
17+
[MovedFrom("UnityEditor.Experimental.AssetImporters")]
1618
public class CollectImportedDependenciesAttribute : Attribute
1719
{
1820
private Type m_ImporterType;

Editor/Mono/EditorMode/ModeService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using System.Linq;
1010
using JetBrains.Annotations;
1111
using UnityEditor.MPE;
12-
using UnityEditor.Experimental.AssetImporters;
12+
using UnityEditor.AssetImporters;
1313
using UnityEngine;
1414
using UnityEngine.Internal;
1515
using UnityEngine.UIElements;

0 commit comments

Comments
 (0)