Skip to content

Commit 70fff5e

Browse files
author
Unity Technologies
committed
Unity 6000.2.0b2 C# reference source code
1 parent d6f29af commit 70fff5e

File tree

268 files changed

+4658
-3123
lines changed

Some content is hidden

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

268 files changed

+4658
-3123
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ private enum AtlasType { Undefined = -1, Master = 0, Variant = 1 }
132132
private string m_Hash;
133133
private int m_PreviewPage = 0;
134134
private int m_TotalPages = 0;
135-
const float kPrefixLabelWidth = 290f;
136135
private int[] m_OptionValues = null;
137136
private string[] m_OptionDisplays = null;
138137
private Texture2D[] m_PreviewTextures = null;
@@ -365,9 +364,6 @@ public override void OnInspectorGUI()
365364

366365
serializedObject.Update();
367366

368-
var oldWidth = EditorGUIUtility.labelWidth;
369-
EditorGUIUtility.labelWidth = kPrefixLabelWidth;
370-
371367
HandleCommonSettingUI();
372368

373369
GUILayout.Space(EditorGUI.kSpacing);
@@ -418,7 +414,6 @@ public override void OnInspectorGUI()
418414
}
419415
}
420416

421-
EditorGUIUtility.labelWidth = oldWidth;
422417
serializedObject.ApplyModifiedProperties();
423418
}
424419

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,11 @@ internal static System.Type GetEditorCurveValueType(ScriptableObject scriptableO
188188
extern public static bool GetDiscreteIntValue([NotNull] GameObject root, EditorCurveBinding binding, out int data);
189189
public static bool GetObjectReferenceValue(GameObject root, EditorCurveBinding binding, out Object data)
190190
{
191-
data = Internal_GetObjectReferenceValue(root, binding);
192-
return data != null;
191+
data = Internal_GetObjectReferenceValue(root, binding, out bool result);
192+
return result;
193193
}
194194

195-
extern private static Object Internal_GetObjectReferenceValue([NotNull] GameObject root, EditorCurveBinding binding);
195+
extern private static Object Internal_GetObjectReferenceValue([NotNull] GameObject root, EditorCurveBinding binding, out bool result);
196196

197197
extern public static Object GetAnimatedObject([NotNull] GameObject root, EditorCurveBinding binding);
198198

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
using UnityEditor;
66
using UnityEditor.IMGUI.Controls;
77
using UnityEngine;
8+
using TreeViewController = UnityEditor.IMGUI.Controls.TreeViewController<int>;
9+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
10+
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
811

912
namespace UnityEditorInternal
1013
{

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
using System.Linq;
1010
using UnityEditor.IMGUI.Controls;
1111
using Object = UnityEngine.Object;
12+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
13+
using TreeViewUtility = UnityEditor.IMGUI.Controls.TreeViewUtility<int>;
1214

1315
namespace UnityEditorInternal
1416
{

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
using UnityEditor;
66
using UnityEditor.IMGUI.Controls;
7+
using TreeViewController = UnityEditor.IMGUI.Controls.TreeViewController<int>;
8+
using TreeViewDataSource = UnityEditor.IMGUI.Controls.TreeViewDataSource<int>;
79

810
namespace UnityEditorInternal
911
{

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
using UnityEngine;
88
using System.Collections.Generic;
99
using UnityEditor.ShortcutManagement;
10+
using TreeViewController = UnityEditor.IMGUI.Controls.TreeViewController<int>;
11+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
12+
using TreeViewGUI = UnityEditor.IMGUI.Controls.TreeViewGUI<int>;
1013

1114
namespace UnityEditorInternal
1215
{

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
using UnityEditor;
77
using System.Collections.Generic;
88
using UnityEditor.IMGUI.Controls;
9+
using TreeViewController = UnityEditor.IMGUI.Controls.TreeViewController<int>;
10+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
11+
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
912

1013
namespace UnityEditorInternal
1114
{

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
using UnityEditor.IMGUI.Controls;
88
using UnityEngine;
99
using Object = UnityEngine.Object;
10+
using TreeViewController = UnityEditor.IMGUI.Controls.TreeViewController<int>;
11+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
12+
using TreeViewUtility = UnityEditor.IMGUI.Controls.TreeViewUtility<int>;
13+
using TreeViewDataSource = UnityEditor.IMGUI.Controls.TreeViewDataSource<int>;
14+
1015

1116
namespace UnityEditorInternal
1217
{

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
using System.Linq;
1010
using UnityEditor.IMGUI.Controls;
1111

12+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
13+
using TreeViewGUI = UnityEditor.IMGUI.Controls.TreeViewGUI<int>;
14+
using TreeViewController = UnityEditor.IMGUI.Controls.TreeViewController<int>;
15+
1216
namespace UnityEditorInternal
1317
{
1418
internal class AnimationWindowHierarchyGUI : TreeViewGUI

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
using UnityEngine;
77
using System.Collections.Generic;
88
using UnityEditor.IMGUI.Controls;
9+
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
10+
911

1012
namespace UnityEditorInternal
1113
{

0 commit comments

Comments
 (0)