Unity 2018.2.0b11 C# reference source code

Unity Technologies · Unity Technologies · commit cc0513fdae7a · 2018-07-03T13:34:59.000Z
diff --git a/Editor/Mono/AssetStore/AssetStoreWindow.cs b/Editor/Mono/AssetStore/AssetStoreWindow.cs
@@ -30,7 +30,7 @@ public static void OpenURL(string url)
         }
 
         // Use this for initialization
-        [MenuItem("Window/General/Asset Store %9", false, 20)]
+        [MenuItem("Window/General/Asset Store %9", false, 301)]
         public static AssetStoreWindow Init()
         {
             AssetStoreWindow window = EditorWindow.GetWindow<AssetStoreWindow>(typeof(SceneView));
diff --git a/Editor/Mono/GUI/WindowLayout.cs b/Editor/Mono/GUI/WindowLayout.cs
@@ -889,13 +889,13 @@ void OnGUI()
 
     internal class CreateBuiltinWindows
     {
-        [MenuItem("Window/General/Scene %1", false, 5)]
+        [MenuItem("Window/General/Scene %1", false, 1)]
         static void ShowSceneView()
         {
             EditorWindow.GetWindow<SceneView>();
         }
 
-        [MenuItem("Window/General/Game %2", false, 1)]
+        [MenuItem("Window/General/Game %2", false, 2)]
         static void ShowGameView()
         {
             EditorWindow.GetWindow<GameView>();
@@ -907,13 +907,13 @@ static void ShowInspector()
             EditorWindow.GetWindow<InspectorWindow>();
         }
 
-        [MenuItem("Window/General/Hierarchy %4", false, 2)]
+        [MenuItem("Window/General/Hierarchy %4", false, 4)]
         static void ShowNewHierarchy()
         {
             EditorWindow.GetWindow<SceneHierarchyWindow>();
         }
 
-        [MenuItem("Window/General/Project %5", false, 4)]
+        [MenuItem("Window/General/Project %5", false, 5)]
         static void ShowProject()
         {
             EditorWindow.GetWindow<ProjectBrowser>();
@@ -925,13 +925,6 @@ static void ShowAnimationWindow()
             EditorWindow.GetWindow<AnimationWindow>();
         }
 
-        // Profiler is registered from native code (EditorWindowController.cpp), for license check
-        //[MenuItem ("Window/Profiler %7", false, 2007)]
-        static void ShowProfilerWindow()
-        {
-            EditorWindow.GetWindow<ProfilerWindow>();
-        }
-
         [MenuItem("Window/Audio/Audio Mixer %8", false, 1)]
         static void ShowAudioMixer()
         {
diff --git a/Editor/Mono/GUIDebugger/GUIViewDebuggerWindow.cs b/Editor/Mono/GUIDebugger/GUIViewDebuggerWindow.cs
@@ -219,7 +219,7 @@ InstructionType instructionType
         readonly SplitterState m_InstructionListDetailSplitter = new SplitterState(new float[] { 30, 70 }, new int[] { 32, 32 }, null);
 
         //Internal Tool for now. Uncomment it to enable it.
-        [MenuItem("Window/Debug/IMGUI Debugger", false, 6, true)]
+        [MenuItem("Window/Analysis/IMGUI Debugger", false, 102, true)]
         static void Init()
         {
             // Get existing open window or if none, make a new one:
diff --git a/Editor/Mono/PerformanceTools/FrameDebugger.cs b/Editor/Mono/PerformanceTools/FrameDebugger.cs
@@ -342,7 +342,7 @@ private struct EventDataStrings
 
         private AttachProfilerUI m_AttachProfilerUI = new AttachProfilerUI();
 
-        [MenuItem("Window/Debug/Frame Debugger", false, 4)]
+        [MenuItem("Window/Analysis/Frame Debugger", false, 10)]
         public static FrameDebuggerWindow ShowFrameDebuggerWindow()
         {
             var wnd = GetWindow(typeof(FrameDebuggerWindow)) as FrameDebuggerWindow;
diff --git a/Editor/Mono/PlayerSettingsAndroid.bindings.cs b/Editor/Mono/PlayerSettingsAndroid.bindings.cs
@@ -227,7 +227,7 @@ public static extern bool forceSDCardPermission
             public static extern bool androidIsGame { get; set; }
 
             // Google Tango mixed reality support
-            internal static extern bool androidTangoEnabled { get; set; }
+            public static extern bool ARCoreEnabled { get; set; }
 
             // Whether Android banner is added to the APK
             internal static extern bool androidBannerEnabled { get; set; }
diff --git a/Editor/Mono/PreferencesWindow/PreferencesWindow.cs b/Editor/Mono/PreferencesWindow/PreferencesWindow.cs
@@ -1312,7 +1312,7 @@ public AppsListUserData(string[] paths, RefString str, Action onChanged)
         void AppsListClick(object userData, string[] options, int selected)
         {
             AppsListUserData ud = (AppsListUserData)userData;
-            if (options[selected] == "Browse...")
+            if (options[selected] == L10n.Tr("Browse..."))
             {
                 string path = EditorUtility.OpenFilePanel("Browse for application", "", InternalEditorUtility.GetApplicationExtensionForRuntimePlatform(Application.platform));
                 if (path.Length != 0)
diff --git a/Editor/Mono/SceneModeWindows/PhysicsDebugWindow.cs b/Editor/Mono/SceneModeWindows/PhysicsDebugWindow.cs
@@ -42,7 +42,7 @@ private static class Contents
 
         //---------------------------------------------------------------------
 
-        [MenuItem("Window/Debug/Physics Debugger", false, 5)]
+        [MenuItem("Window/Analysis/Physics Debugger", false, 11)]
         public static PhysicsDebugWindow ShowWindow()
         {
             var window = GetWindow(typeof(PhysicsDebugWindow)) as PhysicsDebugWindow;
diff --git a/Editor/Mono/UnityConnect/Services/HubAccess.cs b/Editor/Mono/UnityConnect/Services/HubAccess.cs
@@ -55,7 +55,7 @@ static HubAccess()
             UnityConnectServiceCollection.instance.AddService(serviceData);
         }
 
-        [MenuItem("Window/General/Services %0", false, 21)]
+        [MenuItem("Window/General/Services %0", false, 302)]
         private static void ShowMyWindow()
         {
             UnityConnectServiceCollection.instance.ShowService(kServiceName, true, "window_menu_item");
diff --git a/Editor/Mono/VisualStudioIntegration/SolutionSynchronizer.cs b/Editor/Mono/VisualStudioIntegration/SolutionSynchronizer.cs
@@ -59,6 +59,7 @@ enum Mode
             {"cginc", ScriptingLanguage.None},
             {"hlsl", ScriptingLanguage.None},
             {"glslinc", ScriptingLanguage.None},
+            {"template", ScriptingLanguage.None},
         };
 
         private static readonly string[] reimportSyncExtensions = new[] { ".dll", ".asmdef" };
diff --git a/Editor/Src/VR/Mono/PlayerSettingsEditorVR.cs b/Editor/Src/VR/Mono/PlayerSettingsEditorVR.cs
@@ -529,7 +529,7 @@ private void ErrorOnARDeviceIncompatibility(BuildTargetGroup targetGroup)
         {
             if (targetGroup == BuildTargetGroup.Android)
             {
-                if (PlayerSettings.Android.androidTangoEnabled && PlayerSettings.GetPlatformVuforiaEnabled(targetGroup))
+                if (PlayerSettings.Android.ARCoreEnabled && PlayerSettings.GetPlatformVuforiaEnabled(targetGroup))
                 {
                     EditorGUILayout.HelpBox("Both ARCore and Vuforia XR Device support cannot be selected at the same time. Please select only one XR Device that will manage the Android device.", MessageType.Error);
                 }
@@ -557,7 +557,7 @@ internal void TangoGUI(BuildTargetGroup targetGroup)
             // Google Tango settings
             EditorGUILayout.PropertyField(m_AndroidEnableTango, EditorGUIUtility.TrTextContent("ARCore Supported"));
 
-            if (PlayerSettings.Android.androidTangoEnabled)
+            if (PlayerSettings.Android.ARCoreEnabled)
             {
                 EditorGUI.indentLevel++;
 
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerWindow.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerWindow.cs
@@ -571,7 +571,7 @@ private void OnToggleColorBlindMode()
                 : ColorBlindCondition.Default;
         }
 
-        [MenuItem("Window/Debug/Profiler %7", false, 1)]
+        [MenuItem("Window/Analysis/Profiler %7", false, 0)]
         static void ShowProfilerWindow()
         {
             EditorWindow.GetWindow<ProfilerWindow>(false);
diff --git a/Modules/UIElementsDebuggerEditor/UIElementsDebugger.cs b/Modules/UIElementsDebuggerEditor/UIElementsDebugger.cs
@@ -53,7 +53,7 @@ class UIElementsDebugger : EditorWindow
         private static readonly PropertyInfo[] k_FieldInfos = typeof(IStyle).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
         private static readonly PropertyInfo[] k_SortedFieldInfos = k_FieldInfos.OrderBy(f => f.Name).ToArray();
 
-        [MenuItem("Window/Debug/UIElements Debugger", false, 6, true)]
+        [MenuItem("Window/Analysis/UIElements Debugger", false, 101, true)]
         public static void Open()
         {
             GetWindow<UIElementsDebugger>().Show();
diff --git a/Modules/UnityEditorAnalyticsEditor/EditorAnalytics.bindings.cs b/Modules/UnityEditorAnalyticsEditor/EditorAnalytics.bindings.cs
@@ -71,6 +71,11 @@ internal static bool SendCollabUserAction(object parameters)
             return EditorAnalytics.SendEvent("collabUserAction", parameters);
         }
 
+        internal static bool SendCollabOperation(object parameters)
+        {
+            return EditorAnalytics.SendEvent("collabOperation", parameters);
+        }
+
         public extern static bool enabled
         {
             get;
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Unity 2018.2.0b10 C# reference source code
+## Unity 2018.2.0b11 C# reference source code
 
 The C# part of the Unity engine and editor source code.
 May be used for reference purposes only.
diff --git a/Runtime/AR/ScriptBindings/ARBackgroundRenderer.cs b/Runtime/AR/ScriptBindings/ARBackgroundRenderer.cs
@@ -170,15 +170,11 @@ protected void DisableARBackgroundRendering()
             if (null == m_CommandBuffer)
                 return;
 
-            Camera camera;
-
-            if (m_Camera != null)
-                camera = m_Camera;
-            else
-                camera = Camera.main;
+            Camera camera = m_Camera ?? Camera.main;
+            if (camera == null)
+                return;
 
-            if (camera != null)
-                camera.clearFlags = m_CameraClearFlags;
+            camera.clearFlags = m_CameraClearFlags;
 
             // Command buffer
             camera.RemoveCommandBuffer(CameraEvent.BeforeForwardOpaque, m_CommandBuffer);
diff --git a/Runtime/Export/AssemblyInfo.cs b/Runtime/Export/AssemblyInfo.cs
@@ -41,6 +41,8 @@
 [assembly: InternalsVisibleTo("UnityEngine.TestRunner")]
 [assembly: InternalsVisibleTo("UnityEngine.GoogleAudioSpatializer")]
 [assembly: InternalsVisibleTo("Unity.Automation")]
+[assembly: InternalsVisibleTo("Unity.Burst")]
+[assembly: InternalsVisibleTo("Unity.Burst.Editor")]
 [assembly: InternalsVisibleTo("Unity.DeploymentTests.Services")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.UnityAnalytics")]

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public static void OpenURL(string url)`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`// Use this for initialization`
`33`		`- [MenuItem("Window/General/Asset Store %9", false, 20)]`
	`33`	`+ [MenuItem("Window/General/Asset Store %9", false, 301)]`
`34`	`34`	`public static AssetStoreWindow Init()`
`35`	`35`	`{`
`36`	`36`	`AssetStoreWindow window = EditorWindow.GetWindow<AssetStoreWindow>(typeof(SceneView));`
Original file line number	Diff line number	Diff line change
`@@ -889,13 +889,13 @@ void OnGUI()`
`889`	`889`
`890`	`890`	`internal class CreateBuiltinWindows`
`891`	`891`	`{`
`892`		`- [MenuItem("Window/General/Scene %1", false, 5)]`
	`892`	`+ [MenuItem("Window/General/Scene %1", false, 1)]`
`893`	`893`	`static void ShowSceneView()`
`894`	`894`	`{`
`895`	`895`	`EditorWindow.GetWindow<SceneView>();`
`896`	`896`	`}`
`897`	`897`
`898`		`- [MenuItem("Window/General/Game %2", false, 1)]`
	`898`	`+ [MenuItem("Window/General/Game %2", false, 2)]`
`899`	`899`	`static void ShowGameView()`
`900`	`900`	`{`
`901`	`901`	`EditorWindow.GetWindow<GameView>();`
`@@ -907,13 +907,13 @@ static void ShowInspector()`
`907`	`907`	`EditorWindow.GetWindow<InspectorWindow>();`
`908`	`908`	`}`
`909`	`909`
`910`		`- [MenuItem("Window/General/Hierarchy %4", false, 2)]`
	`910`	`+ [MenuItem("Window/General/Hierarchy %4", false, 4)]`
`911`	`911`	`static void ShowNewHierarchy()`
`912`	`912`	`{`
`913`	`913`	`EditorWindow.GetWindow<SceneHierarchyWindow>();`
`914`	`914`	`}`
`915`	`915`
`916`		`- [MenuItem("Window/General/Project %5", false, 4)]`
	`916`	`+ [MenuItem("Window/General/Project %5", false, 5)]`
`917`	`917`	`static void ShowProject()`
`918`	`918`	`{`
`919`	`919`	`EditorWindow.GetWindow<ProjectBrowser>();`
`@@ -925,13 +925,6 @@ static void ShowAnimationWindow()`
`925`	`925`	`EditorWindow.GetWindow<AnimationWindow>();`
`926`	`926`	`}`
`927`	`927`
`928`		`- // Profiler is registered from native code (EditorWindowController.cpp), for license check`
`929`		`- //[MenuItem ("Window/Profiler %7", false, 2007)]`
`930`		`- static void ShowProfilerWindow()`
`931`		`- {`
`932`		`- EditorWindow.GetWindow<ProfilerWindow>();`
`933`		`- }`
`934`		`-`
`935`	`928`	`[MenuItem("Window/Audio/Audio Mixer %8", false, 1)]`
`936`	`929`	`static void ShowAudioMixer()`
`937`	`930`	`{`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ InstructionType instructionType`
`219`	`219`	`readonly SplitterState m_InstructionListDetailSplitter = new SplitterState(new float[] { 30, 70 }, new int[] { 32, 32 }, null);`
`220`	`220`
`221`	`221`	`//Internal Tool for now. Uncomment it to enable it.`
`222`		`- [MenuItem("Window/Debug/IMGUI Debugger", false, 6, true)]`
	`222`	`+ [MenuItem("Window/Analysis/IMGUI Debugger", false, 102, true)]`
`223`	`223`	`static void Init()`
`224`	`224`	`{`
`225`	`225`	`// Get existing open window or if none, make a new one:`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ private struct EventDataStrings`
`342`	`342`
`343`	`343`	`private AttachProfilerUI m_AttachProfilerUI = new AttachProfilerUI();`
`344`	`344`
`345`		`- [MenuItem("Window/Debug/Frame Debugger", false, 4)]`
	`345`	`+ [MenuItem("Window/Analysis/Frame Debugger", false, 10)]`
`346`	`346`	`public static FrameDebuggerWindow ShowFrameDebuggerWindow()`
`347`	`347`	`{`
`348`	`348`	`var wnd = GetWindow(typeof(FrameDebuggerWindow)) as FrameDebuggerWindow;`
Original file line number	Diff line number	Diff line change
`@@ -1312,7 +1312,7 @@ public AppsListUserData(string[] paths, RefString str, Action onChanged)`
`1312`	`1312`	`void AppsListClick(object userData, string[] options, int selected)`
`1313`	`1313`	`{`
`1314`	`1314`	`AppsListUserData ud = (AppsListUserData)userData;`
`1315`		`- if (options[selected] == "Browse...")`
	`1315`	`+ if (options[selected] == L10n.Tr("Browse..."))`
`1316`	`1316`	`{`
`1317`	`1317`	`string path = EditorUtility.OpenFilePanel("Browse for application", "", InternalEditorUtility.GetApplicationExtensionForRuntimePlatform(Application.platform));`
`1318`	`1318`	`if (path.Length != 0)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ private static class Contents`
`42`	`42`
`43`	`43`	`//---------------------------------------------------------------------`
`44`	`44`
`45`		`- [MenuItem("Window/Debug/Physics Debugger", false, 5)]`
	`45`	`+ [MenuItem("Window/Analysis/Physics Debugger", false, 11)]`
`46`	`46`	`public static PhysicsDebugWindow ShowWindow()`
`47`	`47`	`{`
`48`	`48`	`var window = GetWindow(typeof(PhysicsDebugWindow)) as PhysicsDebugWindow;`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ static HubAccess()`
`55`	`55`	`UnityConnectServiceCollection.instance.AddService(serviceData);`
`56`	`56`	`}`
`57`	`57`
`58`		`- [MenuItem("Window/General/Services %0", false, 21)]`
	`58`	`+ [MenuItem("Window/General/Services %0", false, 302)]`
`59`	`59`	`private static void ShowMyWindow()`
`60`	`60`	`{`
`61`	`61`	`UnityConnectServiceCollection.instance.ShowService(kServiceName, true, "window_menu_item");`
Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ private void ErrorOnARDeviceIncompatibility(BuildTargetGroup targetGroup)`
`529`	`529`	`{`
`530`	`530`	`if (targetGroup == BuildTargetGroup.Android)`
`531`	`531`	`{`
`532`		`- if (PlayerSettings.Android.androidTangoEnabled && PlayerSettings.GetPlatformVuforiaEnabled(targetGroup))`
	`532`	`+ if (PlayerSettings.Android.ARCoreEnabled && PlayerSettings.GetPlatformVuforiaEnabled(targetGroup))`
`533`	`533`	`{`
`534`	`534`	`EditorGUILayout.HelpBox("Both ARCore and Vuforia XR Device support cannot be selected at the same time. Please select only one XR Device that will manage the Android device.", MessageType.Error);`
`535`	`535`	`}`
`@@ -557,7 +557,7 @@ internal void TangoGUI(BuildTargetGroup targetGroup)`
`557`	`557`	`// Google Tango settings`
`558`	`558`	`EditorGUILayout.PropertyField(m_AndroidEnableTango, EditorGUIUtility.TrTextContent("ARCore Supported"));`
`559`	`559`
`560`		`- if (PlayerSettings.Android.androidTangoEnabled)`
	`560`	`+ if (PlayerSettings.Android.ARCoreEnabled)`
`561`	`561`	`{`
`562`	`562`	`EditorGUI.indentLevel++;`
`563`	`563`