Unity 2023.1.0a13 C# reference source code

Author: Unity Technologies

Editor/Mono/2D/SpriteAtlas/EditorSpriteAtlas.bindings.cs

@@ -123,5 +123,7 @@ public static class SpriteAtlasExtensions
         extern internal static bool GetSecondaryColorSpace([NotNull("NullExceptionObject")] this SpriteAtlas spriteAtlas, string secondaryTextureName);
         extern internal static void SetSecondaryColorSpace([NotNull("NullExceptionObject")] this SpriteAtlas spriteAtlas, string secondaryTextureName, bool srGB);
         extern internal static void DeleteSecondaryPlatformSettings([NotNull("NullExceptionObject")] this SpriteAtlas spriteAtlas, string secondaryTextureName);
+        extern internal static string GetSecondaryTextureNameInAtlas(string atlasTextureName);
+        extern internal static string GetPageNumberInAtlas(string atlasTextureName);
     }
 }

Editor/Mono/2D/SpriteAtlas/SpriteAtlasImporterInspector.cs

@@ -875,24 +875,10 @@ void CachePreviewTexture()
                         m_OptionValues = new int[m_TotalPages];
                         for (int i = 0; i < m_TotalPages; ++i)
                         {
-                            // Example texName:
-                            //    pageNum                                       secondaryName
-                            //       V                                              | V |
-                            // sactx-2-128x128-Uncompressed-My Sprite Atlas-0fe925a#_Glow-var-0.5...
                             string texName = m_PreviewTextures[i].name;
-                            string pageNum = texName.Split('-')[1];
-                            int hashTag = texName.IndexOf('#');
-                            int dashAfterHashTag = hashTag != -1 ? texName.IndexOf('-', hashTag) : -1;
-
-                            string secondaryName;
-                            if (hashTag == -1)
-                                secondaryName = "";
-                            else if (dashAfterHashTag == -1)
-                                secondaryName = "-" + texName.Substring(hashTag + 1);
-                            else
-                                secondaryName = "-" + texName.Substring(hashTag + 1, dashAfterHashTag - hashTag - 1);
-
-                            m_OptionDisplays[i] = string.Format("#{0}{1}", pageNum, secondaryName);
+                            var pageNum = SpriteAtlasExtensions.GetPageNumberInAtlas(texName);
+                            var secondaryName = SpriteAtlasExtensions.GetSecondaryTextureNameInAtlas(texName);
+                            m_OptionDisplays[i] = secondaryName == "" ? string.Format("MainTex - Page ({0})", pageNum) : string.Format("{0} - Page ({1})", secondaryName, pageNum);
                             m_OptionValues[i] = i;
                         }
                     }

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

@@ -748,24 +748,10 @@ void CachePreviewTexture()
                     m_OptionValues = new int[m_TotalPages];
                     for (int i = 0; i < m_TotalPages; ++i)
                     {
-                        // Example texName:
-                        //    pageNum                                       secondaryName
-                        //       V                                              | V |
-                        // sactx-2-128x128-Uncompressed-My Sprite Atlas-0fe925a#_Glow-var-0.5...
                         string texName = m_PreviewTextures[i].name;
-                        string pageNum = texName.Split('-')[1];
-                        int hashTag = texName.IndexOf('#');
-                        int dashAfterHashTag = hashTag != -1 ? texName.IndexOf('-', hashTag) : -1;
-
-                        string secondaryName;
-                        if (hashTag == -1)
-                            secondaryName = "";
-                        else if (dashAfterHashTag == -1)
-                            secondaryName = "-" + texName.Substring(hashTag + 1);
-                        else
-                            secondaryName = "-" + texName.Substring(hashTag + 1, dashAfterHashTag - hashTag - 1);
-
-                        m_OptionDisplays[i] = string.Format("#{0}{1}", pageNum, secondaryName);
+                        var pageNum = SpriteAtlasExtensions.GetPageNumberInAtlas(texName);
+                        var secondaryName = SpriteAtlasExtensions.GetSecondaryTextureNameInAtlas(texName);
+                        m_OptionDisplays[i] = secondaryName == "" ? string.Format("MainTex - Page ({0})", pageNum) : string.Format("{0} - Page ({1})", secondaryName, pageNum);
                         m_OptionValues[i] = i;
                     }
                 }

Editor/Mono/AssetPipeline/TextureImporter.bindings.cs

@@ -133,10 +133,15 @@ public TextureImporterFormat GetAutomaticFormat(string platform)
                 if (bp.name == platform)
                 {
                     return DefaultFormatFromTextureParameters(settings,
-                        platformSettings,
+                        !platformSettings.overridden ? GetDefaultPlatformTextureSettings() : platformSettings,
                         DoesSourceTextureHaveAlpha(),
                         IsSourceTextureHDR(),
                         bp.defaultTarget);
+
+                    // Regarding the "GetDefaultPlatformTextureSettings" call: in case 1281084, we made it so that platform settings stop automatically
+                    // resetting to the default platform's settings when the platform override is disabled. This introduced a regression where
+                    // "GetAutomaticFormat" would not return the actual format used by platforms with a disabled override, (as in, the one indicated in
+                    // the default platform's settings) which is why we pass in the default platform's settings instead.
                 }
             }
 

Editor/Mono/BuildPipeline.bindings.cs

@@ -322,11 +322,13 @@ public static BuildReport BuildPlayer(BuildPlayerOptions buildPlayerOptions)
         {
             if ((buildPlayerOptions.target == BuildTarget.StandaloneLinux64 ||
                 buildPlayerOptions.target == BuildTarget.StandaloneOSX ||
-                buildPlayerOptions.target == BuildTarget.StandaloneWindows) &&
+                buildPlayerOptions.target == BuildTarget.StandaloneWindows ||
+                buildPlayerOptions.target == BuildTarget.StandaloneWindows64) &&
                 buildPlayerOptions.subtarget == (int)StandaloneBuildSubtarget.Default)
             {
                 buildPlayerOptions.subtarget = (int) EditorUserBuildSettings.standaloneBuildSubtarget;
             }
+            EditorUserBuildSettings.standaloneBuildSubtarget = (StandaloneBuildSubtarget) buildPlayerOptions.subtarget;
 
             return BuildPlayer(buildPlayerOptions.scenes, buildPlayerOptions.locationPathName, buildPlayerOptions.assetBundleManifestPath, buildPlayerOptions.targetGroup, buildPlayerOptions.target, buildPlayerOptions.subtarget, buildPlayerOptions.options, buildPlayerOptions.extraScriptingDefines);
         }