Unity 2017.2.0a3 C# reference source code

Author: Unity Technologies

Editor/Mono/Annotation/LayerVisibilityWindow.cs

@@ -62,7 +62,7 @@ private void CalcValidLayers()
  var s = InternalEditorUtility.GetLayerName(i);
  if (s == string.Empty)
  continue;
- s_LayerNames.Add(s);
+ s_LayerNames.Add(string.Format("{0}: {1}", i, s));
  s_LayerMasks.Add(i);
  m_AllLayersMask |= (1 << i);
  }

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

@@ -48,6 +48,7 @@
 [assembly: InternalsVisibleTo("Assembly-CSharp-Editor-firstpass-testable")]
 [assembly: InternalsVisibleTo("Assembly-CSharp-Editor-testable")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
+[assembly: InternalsVisibleTo("UnityEditor.InteractiveTutorialsFramework")]
 
 
 [assembly: AssemblyIsEditorAssembly]

Editor/Mono/EditorGUI.cs

@@ -3001,7 +3001,8 @@ internal static int LayerFieldInternal(Rect position, GUIContent label, int laye
  }
  }
 
- string[] layers = InternalEditorUtility.layers;
+ string[] layers = InternalEditorUtility.GetLayersWithId();
+
  ArrayUtility.Add(ref layers, "");
  ArrayUtility.Add(ref layers, "Add Layer...");
 

Editor/Mono/EditorGUIUtility.cs

@@ -187,5 +187,13 @@ public static implicit operator Color(SkinnedColor colorSkin)
  return colorSkin.color;
  }
  }
+
+ internal static void ShowObjectPicker<T>(Object obj, bool allowSceneObjects, string searchFilter, ObjectSelectorReceiver objectSelectorReceiver) where T : Object
+ {
+ System.Type objType = typeof(T);
+ ObjectSelector.get.Show(obj, objType, null, allowSceneObjects);
+ ObjectSelector.get.objectSelectorReceiver = objectSelectorReceiver;
+ ObjectSelector.get.searchFilter = searchFilter;
+ }
  }
 }

Editor/Mono/GUI/PackageImportTreeView.cs

@@ -7,6 +7,7 @@
 using System.IO;
 using System.Linq;
 using UnityEditor.IMGUI.Controls;
+using UnityEditor.Utils;
 using UnityEngine;
 using UnityEditorInternal;
 
@@ -545,8 +546,8 @@ public override void FetchData()
  if (PackageImport.HasInvalidCharInFilePath(item.destinationAssetPath))
  continue; // Do not add invalid paths (we already warn the user with a dialog in PackageImport.cs)
 
- string filename = Path.GetFileName(item.destinationAssetPath);
- string folderPath = Path.GetDirectoryName(item.destinationAssetPath);
+ string filename = Path.GetFileName(item.destinationAssetPath).ConvertSeparatorsToUnity();
+ string folderPath = Path.GetDirectoryName(item.destinationAssetPath).ConvertSeparatorsToUnity();
 
  // Ensure folders. This is for when installed packages have been moved to other folders.
  TreeViewItem targetFolder = EnsureFolderPath(folderPath, treeViewFolders, initExpandedState);

Editor/Mono/ImportSettings/EditorPluginImporterExtension.cs

@@ -39,7 +39,7 @@ public EditorProperty(GUIContent name, string key, object defaultValue)
  internal override void Reset(PluginImporterInspector inspector)
  {
  string valueString = inspector.importer.GetEditorData(key);
- ParseStringValue(valueString);
+ ParseStringValue(inspector, valueString);
  }
 
  internal override void Apply(PluginImporterInspector inspector)

Editor/Mono/Inspector/ClothInspector.cs

@@ -159,6 +159,11 @@ bool SelectionMeshDirty()
 
  void GenerateSelectionMesh()
  {
+ if (cloth.vertices.Length == 0)
+ {
+ return;
+ }
+
  SkinnedMeshRenderer smr = cloth.GetComponent<SkinnedMeshRenderer>();
  Vector3[] vertices = cloth.vertices;
 
@@ -308,6 +313,11 @@ void AssignColorsToMeshArray(Color[] colors, Mesh[] meshArray)
 
  void SetupSelectionMeshColors()
  {
+ if (cloth.vertices.Length == 0)
+ {
+ return;
+ }
+
  ClothSkinningCoefficient[] coefficients = cloth.coefficients;
  int length = coefficients.Length;
  Color[] colors = new Color[length * m_MeshVerticesPerSelectionVertex];
@@ -349,6 +359,11 @@ void SetupSelectionMeshColors()
 
  void SetupSelectedMeshColors()
  {
+ if (cloth.vertices.Length == 0)
+ {
+ return;
+ }
+
  int length = cloth.coefficients.Length;
  Color[] colors = new Color[length * m_MeshVerticesPerSelectionVertex];
  for (int i = 0; i < length; i++)
@@ -944,6 +959,12 @@ private void OnPreSceneGUICallback(SceneView sceneView)
  if (state.ToolMode == (ToolMode)(-1))
  state.ToolMode = ToolMode.Select;
 
+ if (m_Selection == null)
+ {
+ GenerateSelectionMesh();
+ SetupSelectedMeshColors();
+ }
+
  ClothSkinningCoefficient[] coefficients = cloth.coefficients;
  if (m_Selection.Length != coefficients.Length && m_Selection.Length != s_MaxVertices)
  // Recreate selection if underlying mesh has changed.