Unity 2018.1.0b7 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/CurveMenuManager.cs

@@ -129,10 +129,12 @@ public void AddTangentMenuItems(GenericMenu menu, List<KeyIdentifier> keyList)
  menu.AddItem(EditorGUIUtility.TrTextContent("Left Tangent/Linear"), allLeftLinear, SetLeftLinear, keyList);
  menu.AddItem(EditorGUIUtility.TrTextContent("Left Tangent/Constant"), allLeftConstant, SetLeftConstant, keyList);
  menu.AddItem(EditorGUIUtility.TrTextContent("Left Tangent/Weighted"), allLeftWeighted, ToggleLeftWeighted, keyList);
+ menu.AddItem(EditorGUIUtility.TrTextContent("Right Tangent/Free"), allRightFree, SetRightEditable, keyList);
  menu.AddItem(EditorGUIUtility.TrTextContent("Right Tangent/Linear"), allRightLinear, SetRightLinear, keyList);
  menu.AddItem(EditorGUIUtility.TrTextContent("Right Tangent/Constant"), allRightConstant, SetRightConstant, keyList);
- menu.AddItem(EditorGUIUtility.TrTextContent("Both Tangents/Free"), allRightFree && allLeftFree, SetBothEditable, keyList);
  menu.AddItem(EditorGUIUtility.TrTextContent("Right Tangent/Weighted"), allRightWeighted, ToggleRightWeighted, keyList);
+ menu.AddItem(EditorGUIUtility.TrTextContent("Both Tangents/Free"), allRightFree && allLeftFree, SetBothEditable, keyList);
+ menu.AddItem(EditorGUIUtility.TrTextContent("Both Tangents/Linear"), allRightLinear && allLeftLinear, SetBothLinear, keyList);
  menu.AddItem(EditorGUIUtility.TrTextContent("Both Tangents/Constant"), allRightConstant && allLeftConstant, SetBothConstant, keyList);
  menu.AddItem(EditorGUIUtility.TrTextContent("Both Tangents/Weighted"), allRightWeighted && allLeftWeighted, ToggleBothWeighted, keyList);
  }
@@ -147,12 +149,15 @@ public void AddTangentMenuItems(GenericMenu menu, List<KeyIdentifier> keyList)
  menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Left Tangent/Free"));
  menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Left Tangent/Linear"));
  menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Left Tangent/Constant"));
+ menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Left Tangent/Weighted"));
  menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Right Tangent/Free"));
  menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Right Tangent/Linear"));
  menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Right Tangent/Constant"));
+ menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Right Tangent/Weighted"));
  menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Both Tangents/Free"));
  menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Both Tangents/Linear"));
  menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Both Tangents/Constant"));
+ menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Both Tangents/Weighted"));
  }
  }
 

Editor/Mono/Animation/MaterialAnimationUtility.cs

@@ -66,8 +66,8 @@ static bool ApplyMaterialModificationToAnimationRecording(PropertyModification[]
  undoModifications[i].previousValue = modifications[i];
  }
 
- UndoPropertyModification[] ret = Undo.postprocessModifications(undoModifications);
- return (ret.Length != modifications.Length);
+ UndoPropertyModification[] ret = Undo.InvokePostprocessModifications(undoModifications);
+ return ret.Length != modifications.Length;
  }
 
  static public bool OverridePropertyColor(MaterialProperty materialProp, Renderer target, out Color color)

Editor/Mono/AssemblyHelper.cs

@@ -17,6 +17,8 @@ namespace UnityEditor
 {
  internal partial class AssemblyHelper
  {
+ static readonly Type[] ExtendableScriptTypes = { typeof(MonoBehaviour), typeof(ScriptableObject), typeof(Experimental.AssetImporters.ScriptedImporter) };
+
  // Check if assmebly internal name doesn't match file name, and show the warning.
  static public void CheckForAssemblyFileNameMismatch(string assemblyPath)
  {
@@ -50,24 +52,6 @@ static public string[] GetNamesOfAssembliesLoadedInCurrentDomain()
  return locations.ToArray();
  }
 
- public static Assembly FindLoadedAssemblyWithName(string s)
- {
- var assemblies = AppDomain.CurrentDomain.GetAssemblies();
- foreach (var a in assemblies)
- {
- try
- {
- if (s == System.IO.Path.GetFileNameWithoutExtension(a.Location))
- return a;
- }
- catch (NotSupportedException)
- {
- //we have some "dynamic" assmeblies that do not have a filename
- }
- }
- return null;
- }
-
  static public string ExtractInternalAssemblyName(string path)
  {
  try
@@ -222,55 +206,29 @@ static public bool IsUnityEngineModule(Assembly assembly)
  return assembly.GetCustomAttributes(typeof(UnityEngineModuleAssembly), false).Length > 0;
  }
 
- private static bool IsTypeAUserExtendedScript(AssemblyDefinition assembly, TypeReference type)
+ private static bool IsTypeAUserExtendedScript(TypeReference type)
  {
- if (type == null)
+ if (type == null || type.FullName == "System.Object")
  return false;
 
- // Early out
- if (type.FullName == "System.Object")
- return false;
-
- // Look up the type in UnityEngine.dll or UnityEditor.dll
- Assembly builtinAssembly = null;
- if (type.Scope.Name == "UnityEngine" || type.Scope.Name == "UnityEngine.CoreModule")
- builtinAssembly = typeof(MonoBehaviour).Assembly;
- else if (type.Scope.Name == "UnityEditor")
- builtinAssembly = typeof(EditorWindow).Assembly;
- else if (type.Scope.Name == "UnityEngine.UI")
- builtinAssembly = FindLoadedAssemblyWithName("UnityEngine.UI");
-
- if (builtinAssembly != null)
+ foreach (var extendableScriptType in ExtendableScriptTypes)
  {
- // TypeReference.FullName is cached and is preferred to use, but in case of generic types it
- // includes generic arguments we can't use to get type from assembly.
- var typeName = type.IsGenericInstance ? (type.Namespace + "." + type.Name) : type.FullName;
- var engineType = builtinAssembly.GetType(typeName);
-
- // TODO: this "list of classes" should get dynamically filled by the classes them self, thus removing dependency of this class on those classes.
- if (engineType != null)
- {
- if (engineType == typeof(MonoBehaviour) || engineType.IsSubclassOf(typeof(MonoBehaviour)))
- return true;
- if (engineType == typeof(ScriptableObject) || engineType.IsSubclassOf(typeof(ScriptableObject)))
- return true;
- if (engineType == typeof(Experimental.AssetImporters.ScriptedImporter) || engineType.IsSubclassOf(typeof(Experimental.AssetImporters.ScriptedImporter)))
- return true;
- }
+ if (type.Name == extendableScriptType.Name && type.Namespace == extendableScriptType.Namespace)
+ return true;
  }
 
- TypeDefinition typeDefinition = null;
  try
  {
- typeDefinition = type.Resolve();
+ var typeDefinition = type.Resolve();
+
+ if (typeDefinition != null)
+ return IsTypeAUserExtendedScript(typeDefinition.BaseType);
  }
  catch (AssemblyResolutionException)
  {
  // just eat exception if we fail to load assembly here.
  // failure should be handled better in other places.
  }
- if (typeDefinition != null)
- return IsTypeAUserExtendedScript(assembly, typeDefinition.BaseType);
 
  return false;
  }
@@ -308,7 +266,7 @@ public static void ExtractAllClassesThatAreUserExtendedScripts(string path, out
 
  try
  {
- if (IsTypeAUserExtendedScript(assembly, baseType))
+ if (IsTypeAUserExtendedScript(baseType))
  {
  classNames.Add(type.Name);
  nameSpaces.Add(type.Namespace);

Editor/Mono/BuildPipeline/MonoCrossCompile.cs

@@ -4,6 +4,7 @@
 
 using UnityEngine;
 using UnityEditor;
+using UnityEditor.Scripting.ScriptCompilation;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -233,8 +234,7 @@ static public bool CrossCompileAOTDirectoryParallel(string crossCompilerPath, Bu
 
  static bool IsDebugableAssembly(string fname)
  {
- fname = Path.GetFileName(fname);
- return fname.StartsWith("Assembly", StringComparison.OrdinalIgnoreCase);
+ return EditorCompilationInterface.Instance.IsRuntimeScriptAssembly(fname);
  }
 
  static void CrossCompileAOT(BuildTarget target, string crossCompilerAbsolutePath, string assembliesAbsoluteDirectory, CrossCompileOptions crossCompileOptions, string input, string output, string additionalOptions)

Editor/Mono/GUI/DockArea.cs

@@ -99,6 +99,8 @@ protected override void OnDestroy()
  UnityEngine.Object.DestroyImmediate(w, true);
  }
 
+ m_Panes.Clear();
+
  base.OnDestroy();
  }
 

Editor/Mono/GUIDebugger/GUIViewDebuggerHelper.bindings.cs

@@ -109,6 +109,7 @@ internal struct IMGUIInstruction
  public StackFrame[] stack;
 
  public int typeInstructionIndex;
+ public bool enabled;
  }
 
  [NativeHeader("Editor/Mono/GUIDebugger/GUIViewDebuggerHelper.bindings.h")]

Editor/Mono/GUIView.cs

@@ -179,6 +179,7 @@ protected virtual void OnDisable()
  if (imguiContainer.HasMouseCapture())
  MouseCaptureController.ReleaseMouseCapture();
  visualTree.Remove(imguiContainer);
+ imguiContainer = null;
  }
 
  protected virtual void OldOnGUI() {}
@@ -212,6 +213,9 @@ protected override void SetPosition(Rect newPos)
  protected override void OnDestroy()
  {
  Internal_Close();
+
+ UIElementsUtility.RemoveCachedPanel(this.GetInstanceID());
+
  base.OnDestroy();
  }
 

Editor/Mono/ImportSettings/AssetImporterEditor.cs

@@ -14,7 +14,11 @@ public abstract class AssetImporterEditor : Editor
  bool m_MightHaveModified = false;
 
  private Editor m_AssetEditor;
- internal Editor assetEditor { private get { return m_AssetEditor; } set { m_AssetEditor = value; } }
+ // Called from ActiveEditorTracker.cpp to setup the target editor once created before Awake and OnEnable of the Editor.
+ internal void InternalSetAssetImporterTargetEditor(Object editor)
+ {
+ m_AssetEditor = editor as Editor;
+ }
 
  protected internal Object[] assetTargets { get { return m_AssetEditor != null ? m_AssetEditor.targets : null; } }
  protected internal Object assetTarget { get { return m_AssetEditor != null ? m_AssetEditor.target : null; } }
@@ -24,7 +28,7 @@ internal override string targetTitle
  {
  get
  {
- return string.Format(L10n.Tr("{0} Import Settings"), assetEditor == null ? string.Empty : assetEditor.targetTitle);
+ return string.Format(L10n.Tr("{0} Import Settings"), m_AssetEditor == null ? string.Empty : m_AssetEditor.targetTitle);
  }
  }
 
@@ -34,17 +38,17 @@ internal override int referenceTargetIndex
  set
  {
  base.referenceTargetIndex = value;
- if (assetEditor != null)
- assetEditor.referenceTargetIndex = value;
+ if (m_AssetEditor != null)
+ m_AssetEditor.referenceTargetIndex = value;
  }
  }
 
  internal override IPreviewable preview
  {
  get
  {
- if (useAssetDrawPreview && assetEditor != null)
- return assetEditor;
+ if (useAssetDrawPreview && m_AssetEditor != null)
+ return m_AssetEditor;
  // Sometimes assetEditor has gone away because of "magical" workarounds and we need to fall back to base.Preview.
  // See cases 597496 and 601174 for context.
  return base.preview;
@@ -58,8 +62,8 @@ internal override IPreviewable preview
  // Make the Importer use the icon of the asset
  internal override void OnHeaderIconGUI(Rect iconRect)
  {
- if (assetEditor != null)
- assetEditor.OnHeaderIconGUI(iconRect);
+ if (m_AssetEditor != null)
+ m_AssetEditor.OnHeaderIconGUI(iconRect);
  }
 
  // Let asset importers decide if the imported object should be shown as a separate editor or not
@@ -241,7 +245,7 @@ protected virtual bool OnApplyRevertGUI()
 
  protected void ApplyRevertGUI()
  {
- if (assetEditor == null || assetEditor.target == null)
+ if (m_AssetEditor == null || m_AssetEditor.target == null)
  {
  // always apply changes when buttons are hidden
  Apply();

Editor/Mono/ImportSettings/TextureImportPlatformSettings.cs

@@ -353,6 +353,8 @@ public void Apply()
  (int)TextureImporterFormat.RGBAHalf,
  (int)TextureImporterFormat.BC4,
  (int)TextureImporterFormat.BC5,
+ (int)TextureImporterFormat.BC6H,
+ (int)TextureImporterFormat.BC7,
 
  (int)TextureImporterFormat.ASTC_RGB_4x4,
  (int)TextureImporterFormat.ASTC_RGB_5x5,

Editor/Mono/Inspector/InspectorWindow.cs

@@ -405,7 +405,6 @@ protected virtual void OnGUI()
  s_CurrentInspectorWindow = this;
  Editor[] editors = tracker.activeEditors;
 
- AssignAssetEditor(editors);
  Profiler.BeginSample("InspectorWindow.DrawEditors()");
  DrawEditors(editors);
  Profiler.EndSample();
@@ -997,15 +996,6 @@ protected void DrawVCSShortInfoAsset(Asset asset, string tooltip, Rect rect, Tex
  EditorGUI.LabelField(textRect, content, styles.preToolbar2);
  }
 
- protected void AssignAssetEditor(Editor[] editors)
- {
- // Assign asset editor to importer editor
- if (editors.Length > 1 && editors[0] is AssetImporterEditor)
- {
- (editors[0] as AssetImporterEditor).assetEditor = editors[1];
- }
- }
-
  private void DrawEditors(Editor[] editors)
  {
  if (editors.Length == 0)