Unity 2018.2.16f1 C# reference source code

Unity Technologies · Unity Technologies · commit fe21f7ffa38d · 2018-11-15T11:01:20.000Z
diff --git a/Editor/Mono/GameView/GameViewSizes.cs b/Editor/Mono/GameView/GameViewSizes.cs
@@ -198,8 +198,12 @@ private void InitBuiltinGroups()
             // iOS
             GameViewSize k_iPhone_750p_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 750, 1334, "iPhone 1334x750 Portrait");
             GameViewSize k_iPhone_750p_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 1334, 750, "iPhone 1334x750 Landscape");
-            GameViewSize k_iPhone_X_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 1125, 2436, "iPhoneX 2436x1125 Portrait");
-            GameViewSize k_iPhone_X_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 2436, 1125, "iPhoneX 2436x1125 Landscape");
+            GameViewSize k_iPhone_X_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 1125, 2436, "iPhone X/XS 2436x1125 Portrait");
+            GameViewSize k_iPhone_X_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 2436, 1125, "iPhone X/XS 2436x1125 Landscape");
+            GameViewSize k_iPhone_828p_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 828, 1792, "iPhone XR 1792x828 Portrait");
+            GameViewSize k_iPhone_828p_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 1792, 828, "iPhone XR 1792x828 Landscape");
+            GameViewSize k_iPhone_1242p_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 1242, 2688, "iPhone XS Max 2688x1242 Portrait");
+            GameViewSize k_iPhone_1242p_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 2688, 1242, "iPhone XS Max 2688x1242 Landscape");
 
             GameViewSize k_iPad_1536p_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 2048, 1536, "iPad 2048x1536 Landscape");
             GameViewSize k_iPad_1536p_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 1536, 2048, "iPad 2048x1536 Portrait");
@@ -236,6 +240,8 @@ private void InitBuiltinGroups()
                 k_iPhone_750p_Portrait, k_iPhone_750p_Landscape,
                 k_1080p_Portrait, k_1080p_Landscape,
                 k_iPhone_X_Portrait, k_iPhone_X_Landscape,
+                k_iPhone_828p_Portrait, k_iPhone_828p_Landscape,
+                k_iPhone_1242p_Portrait, k_iPhone_1242p_Landscape,
                 k_iPad_1536p_Landscape, k_iPad_1536p_Portrait,
                 k_iPad_2048p_Landscape, k_iPad_2048p_Portrait,
                 k_iPad_1668p_Landscape, k_iPad_1668p_Portrait,
diff --git a/Editor/Mono/ImportSettings/ModelImporterMaterialEditor.cs b/Editor/Mono/ImportSettings/ModelImporterMaterialEditor.cs
@@ -30,7 +30,6 @@ internal class ModelImporterMaterialEditor : BaseAssetImporterTabUI
 
         SerializedProperty m_SupportsEmbeddedMaterials;
 
-        SerializedProperty m_UseSRGBMaterialColor;
         private bool m_HasEmbeddedMaterials = false;
 
         static class Styles
@@ -100,7 +99,6 @@ static class Styles
 
             public static GUIContent RemapOptions = EditorGUIUtility.TrTextContent("On Demand Remap");
             public static GUIContent RemapMaterialsInProject = EditorGUIUtility.TrTextContent("Search and Remap", "Click on this button to search and remap the materials from the project.");
-            public static GUIContent SRGBMaterialColor = EditorGUIUtility.TrTextContent("sRGB Albedo Colors", "Albedo colors in gamma space. Disable this for projects using linear color space.");
         }
 
         public ModelImporterMaterialEditor(AssetImporterEditor panelContainer)
@@ -111,6 +109,7 @@ private void UpdateShowAllMaterialNameOptions()
         {
             // We need to display BasedOnTextureName_Or_ModelNameAndMaterialName obsolete option for objects which use this option
 #pragma warning disable 618
+            m_MaterialName = serializedObject.FindProperty("m_MaterialName");
             m_ShowAllMaterialNameOptions = (m_MaterialName.intValue == (int)ModelImporterMaterialName.BasedOnTextureName_Or_ModelNameAndMaterialName);
 #pragma warning restore 618
         }
@@ -158,7 +157,18 @@ internal override void OnEnable()
 
             m_SupportsEmbeddedMaterials = serializedObject.FindProperty("m_SupportsEmbeddedMaterials");
 
-            m_UseSRGBMaterialColor = serializedObject.FindProperty("m_UseSRGBMaterialColor");
+            UpdateShowAllMaterialNameOptions();
+        }
+
+        internal override void ResetValues()
+        {
+            base.ResetValues();
+            UpdateShowAllMaterialNameOptions();
+        }
+
+        internal override void PostApply()
+        {
+            UpdateShowAllMaterialNameOptions();
         }
 
         public override void OnInspectorGUI()
@@ -356,16 +366,13 @@ void DoMaterialsGUI()
         {
             serializedObject.UpdateIfRequiredOrScript();
 
-            UpdateShowAllMaterialNameOptions();
-
             EditorGUILayout.PropertyField(m_ImportMaterials, Styles.ImportMaterials);
 
             string materialHelp = string.Empty;
             if (!m_ImportMaterials.hasMultipleDifferentValues)
             {
                 if (m_ImportMaterials.boolValue)
                 {
-                    EditorGUILayout.PropertyField(m_UseSRGBMaterialColor, Styles.SRGBMaterialColor);
                     EditorGUILayout.Popup(m_MaterialLocation, Styles.MaterialLocationOpt, Styles.MaterialLocation);
                     if (!m_MaterialLocation.hasMultipleDifferentValues)
                     {
diff --git a/Modules/AI/NavMesh/NavMesh.bindings.cs b/Modules/AI/NavMesh/NavMesh.bindings.cs
@@ -10,7 +10,7 @@ namespace UnityEngine.AI
     public static partial class NavMesh
     {
         [StaticAccessor("GetNavMeshManager()")]
-        [NativeName("Cleanup")]
+        [NativeName("CleanupAfterCarving")]
         public static extern void RemoveAllNavMeshData();
     }
 }
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Unity 2018.2.15f1 C# reference source code
+## Unity 2018.2.16f1 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
`@@ -10,7 +10,7 @@ namespace UnityEngine.AI`
`10`	`10`	`public static partial class NavMesh`
`11`	`11`	`{`
`12`	`12`	`[StaticAccessor("GetNavMeshManager()")]`
`13`		`- [NativeName("Cleanup")]`
	`13`	`+ [NativeName("CleanupAfterCarving")]`
`14`	`14`	`public static extern void RemoveAllNavMeshData();`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## Unity 2018.2.15f1 C# reference source code`
	`1`	`+## Unity 2018.2.16f1 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.`