Unity 2019.3.0b12 C# reference source code

Unity Technologies · Unity Technologies · commit 7d9da8ac9cc5 · 2019-11-21T20:46:51.000Z
diff --git a/Editor/Mono/GUI/Toolbar.cs b/Editor/Mono/GUI/Toolbar.cs
@@ -108,6 +108,7 @@ void InitializeToolIcons()
         static GUIContent s_CustomToolIcon;
         static GUIContent[] s_SnapToGridIcons;
         static int s_ViewToolOnOffset;
+        internal static event Action<Rect> toolSettingsGui = delegate(Rect rect) {};
         private static GUIContent s_AccountContent;
         static GUIContent   s_CloudIcon;
         static class Styles
@@ -238,6 +239,8 @@ protected override void OldOnGUI()
             ReserveWidthRight(standardButtonWidth, ref pos);
             DoSnapButtons(EditorToolGUI.GetThickArea(pos));
 
+            DoAdditionalSettingsCallback(EditorToolGUI.GetThickArea(pos));
+
             // Position centered controls.
             pos = new Rect(playModeControlsStart, 0, 240, 0);
 
@@ -402,7 +405,6 @@ void DoToolButtons(Rect rect)
 
         void DoToolSettings(Rect rect)
         {
-            rect = EditorToolGUI.GetThinArea(rect);
             EditorToolGUI.DoBuiltinToolSettings(rect, Styles.buttonLeft, Styles.buttonRight);
         }
 
@@ -417,6 +419,14 @@ void DoSnapButtons(Rect rect)
             }
         }
 
+        void DoAdditionalSettingsCallback(Rect rect)
+        {
+            rect.x += rect.width + 8;
+            float playButtonsStart = position.width / 2 - (Styles.commandLeft.fixedWidth + Styles.commandMid.fixedWidth + Styles.commandRight.fixedWidth) * .5f;
+            rect.width = (playButtonsStart - rect.x) - 28;
+            toolSettingsGui(rect);
+        }
+
         void DoPlayButtons(bool isOrWillEnterPlaymode)
         {
             // Enter / Exit Playmode
diff --git a/Editor/Mono/GUI/Tools/EditorToolContext.cs b/Editor/Mono/GUI/Tools/EditorToolContext.cs
@@ -577,15 +577,15 @@ internal static void GetCustomEditorToolsForTarget(UnityObject target, List<Edit
 
             foreach (var tool in instance.m_CustomEditorTools)
             {
-                if (tool.target == target)
+                if (tool.targets.Contains(target))
                     list.Add(tool);
             }
 
             if (searchLockedInspectors)
             {
                 foreach (var tool in instance.m_LockedCustomEditorTools)
                 {
-                    if (tool.target == target)
+                    if (tool.targets.Contains(target))
                         list.Add(tool);
                 }
             }
diff --git a/Editor/Mono/VersionControl/Common/VCAsset.cs b/Editor/Mono/VersionControl/Common/VCAsset.cs
@@ -138,6 +138,9 @@ internal static string AllStateToString(States state)
             if (IsState(state, States.ReadOnly))
                 sb.Append("ReadOnly, ");
 
+            if (IsState(state, States.Unversioned))
+                sb.Append("Unversioned, ");
+
             // remove trailing ", " if had any
             if (sb.Length > 2)
                 sb.Remove(sb.Length - 2, 2);
diff --git a/Editor/Mono/VersionControl/VCAsset.bindings.cs b/Editor/Mono/VersionControl/VCAsset.bindings.cs
@@ -39,7 +39,8 @@ public enum States
             ReadOnly = 16384,
             MetaFile = 32768,
             MovedLocal = 65536,
-            MovedRemote = 131072
+            MovedRemote = 131072,
+            Unversioned = 262144
         }
 
         public Asset(string clientPath)
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Unity 2019.3.0b11 C# reference source code
+## Unity 2019.3.0b12 C# reference source code
 
 The C# part of the Unity engine and editor source code.
 May be used for reference purposes only.

Original file line number	Diff line number	Diff line change
`@@ -577,15 +577,15 @@ internal static void GetCustomEditorToolsForTarget(UnityObject target, List<Edit`
`577`	`577`
`578`	`578`	`foreach (var tool in instance.m_CustomEditorTools)`
`579`	`579`	`{`
`580`		`- if (tool.target == target)`
	`580`	`+ if (tool.targets.Contains(target))`
`581`	`581`	`list.Add(tool);`
`582`	`582`	`}`
`583`	`583`
`584`	`584`	`if (searchLockedInspectors)`
`585`	`585`	`{`
`586`	`586`	`foreach (var tool in instance.m_LockedCustomEditorTools)`
`587`	`587`	`{`
`588`		`- if (tool.target == target)`
	`588`	`+ if (tool.targets.Contains(target))`
`589`	`589`	`list.Add(tool);`
`590`	`590`	`}`
`591`	`591`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ public enum States`
`39`	`39`	`ReadOnly = 16384,`
`40`	`40`	`MetaFile = 32768,`
`41`	`41`	`MovedLocal = 65536,`
`42`		`- MovedRemote = 131072`
	`42`	`+ MovedRemote = 131072,`
	`43`	`+ Unversioned = 262144`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`public Asset(string clientPath)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## Unity 2019.3.0b11 C# reference source code`
	`1`	`+## Unity 2019.3.0b12 C# reference source code`
`2`	`2`
`3`	`3`	`The C# part of the Unity engine and editor source code.`
`4`	`4`	`May be used for reference purposes only.`