Skip to content

Commit cc0513f

Browse files
author
Unity Technologies
committed
Unity 2018.2.0b11 C# reference source code
1 parent 54dd67f commit cc0513f

16 files changed

Lines changed: 28 additions & 31 deletions

File tree

Editor/Mono/AssetStore/AssetStoreWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static void OpenURL(string url)
3030
}
3131

3232
// Use this for initialization
33-
[MenuItem("Window/General/Asset Store %9", false, 20)]
33+
[MenuItem("Window/General/Asset Store %9", false, 301)]
3434
public static AssetStoreWindow Init()
3535
{
3636
AssetStoreWindow window = EditorWindow.GetWindow<AssetStoreWindow>(typeof(SceneView));

Editor/Mono/GUI/WindowLayout.cs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -889,13 +889,13 @@ void OnGUI()
889889

890890
internal class CreateBuiltinWindows
891891
{
892-
[MenuItem("Window/General/Scene %1", false, 5)]
892+
[MenuItem("Window/General/Scene %1", false, 1)]
893893
static void ShowSceneView()
894894
{
895895
EditorWindow.GetWindow<SceneView>();
896896
}
897897

898-
[MenuItem("Window/General/Game %2", false, 1)]
898+
[MenuItem("Window/General/Game %2", false, 2)]
899899
static void ShowGameView()
900900
{
901901
EditorWindow.GetWindow<GameView>();
@@ -907,13 +907,13 @@ static void ShowInspector()
907907
EditorWindow.GetWindow<InspectorWindow>();
908908
}
909909

910-
[MenuItem("Window/General/Hierarchy %4", false, 2)]
910+
[MenuItem("Window/General/Hierarchy %4", false, 4)]
911911
static void ShowNewHierarchy()
912912
{
913913
EditorWindow.GetWindow<SceneHierarchyWindow>();
914914
}
915915

916-
[MenuItem("Window/General/Project %5", false, 4)]
916+
[MenuItem("Window/General/Project %5", false, 5)]
917917
static void ShowProject()
918918
{
919919
EditorWindow.GetWindow<ProjectBrowser>();
@@ -925,13 +925,6 @@ static void ShowAnimationWindow()
925925
EditorWindow.GetWindow<AnimationWindow>();
926926
}
927927

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-
935928
[MenuItem("Window/Audio/Audio Mixer %8", false, 1)]
936929
static void ShowAudioMixer()
937930
{

Editor/Mono/GUIDebugger/GUIViewDebuggerWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ InstructionType instructionType
219219
readonly SplitterState m_InstructionListDetailSplitter = new SplitterState(new float[] { 30, 70 }, new int[] { 32, 32 }, null);
220220

221221
//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)]
223223
static void Init()
224224
{
225225
// Get existing open window or if none, make a new one:

Editor/Mono/PerformanceTools/FrameDebugger.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ private struct EventDataStrings
342342

343343
private AttachProfilerUI m_AttachProfilerUI = new AttachProfilerUI();
344344

345-
[MenuItem("Window/Debug/Frame Debugger", false, 4)]
345+
[MenuItem("Window/Analysis/Frame Debugger", false, 10)]
346346
public static FrameDebuggerWindow ShowFrameDebuggerWindow()
347347
{
348348
var wnd = GetWindow(typeof(FrameDebuggerWindow)) as FrameDebuggerWindow;

Editor/Mono/PlayerSettingsAndroid.bindings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public static extern bool forceSDCardPermission
227227
public static extern bool androidIsGame { get; set; }
228228

229229
// Google Tango mixed reality support
230-
internal static extern bool androidTangoEnabled { get; set; }
230+
public static extern bool ARCoreEnabled { get; set; }
231231

232232
// Whether Android banner is added to the APK
233233
internal static extern bool androidBannerEnabled { get; set; }

Editor/Mono/PreferencesWindow/PreferencesWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1312,7 +1312,7 @@ public AppsListUserData(string[] paths, RefString str, Action onChanged)
13121312
void AppsListClick(object userData, string[] options, int selected)
13131313
{
13141314
AppsListUserData ud = (AppsListUserData)userData;
1315-
if (options[selected] == "Browse...")
1315+
if (options[selected] == L10n.Tr("Browse..."))
13161316
{
13171317
string path = EditorUtility.OpenFilePanel("Browse for application", "", InternalEditorUtility.GetApplicationExtensionForRuntimePlatform(Application.platform));
13181318
if (path.Length != 0)

Editor/Mono/SceneModeWindows/PhysicsDebugWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private static class Contents
4242

4343
//---------------------------------------------------------------------
4444

45-
[MenuItem("Window/Debug/Physics Debugger", false, 5)]
45+
[MenuItem("Window/Analysis/Physics Debugger", false, 11)]
4646
public static PhysicsDebugWindow ShowWindow()
4747
{
4848
var window = GetWindow(typeof(PhysicsDebugWindow)) as PhysicsDebugWindow;

Editor/Mono/UnityConnect/Services/HubAccess.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static HubAccess()
5555
UnityConnectServiceCollection.instance.AddService(serviceData);
5656
}
5757

58-
[MenuItem("Window/General/Services %0", false, 21)]
58+
[MenuItem("Window/General/Services %0", false, 302)]
5959
private static void ShowMyWindow()
6060
{
6161
UnityConnectServiceCollection.instance.ShowService(kServiceName, true, "window_menu_item");

Editor/Mono/VisualStudioIntegration/SolutionSynchronizer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ enum Mode
5959
{"cginc", ScriptingLanguage.None},
6060
{"hlsl", ScriptingLanguage.None},
6161
{"glslinc", ScriptingLanguage.None},
62+
{"template", ScriptingLanguage.None},
6263
};
6364

6465
private static readonly string[] reimportSyncExtensions = new[] { ".dll", ".asmdef" };

Editor/Src/VR/Mono/PlayerSettingsEditorVR.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ private void ErrorOnARDeviceIncompatibility(BuildTargetGroup targetGroup)
529529
{
530530
if (targetGroup == BuildTargetGroup.Android)
531531
{
532-
if (PlayerSettings.Android.androidTangoEnabled && PlayerSettings.GetPlatformVuforiaEnabled(targetGroup))
532+
if (PlayerSettings.Android.ARCoreEnabled && PlayerSettings.GetPlatformVuforiaEnabled(targetGroup))
533533
{
534534
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);
535535
}
@@ -557,7 +557,7 @@ internal void TangoGUI(BuildTargetGroup targetGroup)
557557
// Google Tango settings
558558
EditorGUILayout.PropertyField(m_AndroidEnableTango, EditorGUIUtility.TrTextContent("ARCore Supported"));
559559

560-
if (PlayerSettings.Android.androidTangoEnabled)
560+
if (PlayerSettings.Android.ARCoreEnabled)
561561
{
562562
EditorGUI.indentLevel++;
563563

0 commit comments

Comments
 (0)