Unity 2023.3.0b10 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimatorController.cs

@@ -275,6 +275,15 @@ public void SetStateEffectiveMotion(AnimatorState state, Motion motion)
 
         public void SetStateEffectiveMotion(AnimatorState state, Motion motion, int layerIndex)
         {
+            //delete existing nested blend tree asset
+            Motion selectedMotion = GetStateEffectiveMotion(state, layerIndex);
+            BlendTree blendTree = selectedMotion as BlendTree;
+
+            if (blendTree != null && !AssetDatabase.IsMainAsset(blendTree))
+            {
+                MecanimUtilities.DestroyBlendTreeRecursive(blendTree);
+            }
+
             if (layers[layerIndex].syncedLayerIndex == -1)
             {
                 undoHandler.DoUndo(state, "Set Motion");

Editor/Mono/AssetPipeline/SpeedTree/SpeedTree9Importer.cs

@@ -182,6 +182,12 @@ public override void OnImportAsset(AssetImportContext ctx)
             }
 
             GameObject mainObject = new GameObject(ImporterSettings.kGameObjectName);
+
+            if (m_AdditionalSettings.generateRigidbody)
+            {
+                CreateAndAddRigidBodyToAsset(mainObject);
+            }
+
             ctx.AddObjectToAsset(ImporterSettings.kGameObjectName, mainObject);
             ctx.SetMainObject(mainObject);
 
@@ -1321,6 +1327,16 @@ private bool TryGetShaderForCurrentRenderPipeline(STRenderPipeline renderPipelin
             return shader != null;
         }
 
+        private void CreateAndAddRigidBodyToAsset(GameObject mainObject)
+        {
+            Rigidbody rb = mainObject.AddComponent<Rigidbody>();
+            if (rb != null)
+            {
+                rb.useGravity = false;
+                rb.isKinematic = true;
+            }
+        }
+
         private void CreateAndAddCollidersToAsset()
         {
             for (int iCollider = 0; iCollider < m_CollisionObjectsCount; ++iCollider)

Editor/Mono/AssetPipeline/SpeedTree/SpeedTree9ImporterModelEditor.cs

@@ -40,6 +40,7 @@ class SpeedTree9ImporterModelEditor : BaseSpeedTree9ImporterTabUI
         // Additional Settings properties
         private SerializedProperty m_MotionVectorModeEnumValue;
         private SerializedProperty m_GenerateColliders;
+        private SerializedProperty m_GenerateRigidbody;
 
         // LOD properties
         private SerializedProperty m_EnableSmoothLOD;
@@ -113,6 +114,7 @@ internal override void OnEnable()
 
                 m_MotionVectorModeEnumValue = FindPropertyFromName(addSettingsStr, nameof(addSettings.motionVectorModeEnumValue));
                 m_GenerateColliders = FindPropertyFromName(addSettingsStr, nameof(addSettings.generateColliders));
+                m_GenerateRigidbody = FindPropertyFromName(addSettingsStr, nameof(addSettings.generateRigidbody));
             }
 
             // LOD properties
@@ -200,7 +202,8 @@ public override void OnInspectorGUI()
             // Additional Settings
             SpeedTreeImporterCommonEditor.ShowAdditionalSettingsGUI(
                 ref m_MotionVectorModeEnumValue,
-                ref m_GenerateColliders);
+                ref m_GenerateColliders,
+                ref m_GenerateRigidbody);
 
             EditorGUILayout.Space();
 

Editor/Mono/AssetPipeline/SpeedTree/SpeedTreeImporterCommon.cs

@@ -276,12 +276,14 @@ static internal void ShowLightingGUI(
 
         static internal void ShowAdditionalSettingsGUI(
             ref SerializedProperty motionVectorModeEnumValue,
-            ref SerializedProperty generateColliders)
+            ref SerializedProperty generateColliders,
+            ref SerializedProperty generateRigidbody)
         {
             GUILayout.Label(Styles.AdditionalSettingsHeader, EditorStyles.boldLabel);
             EditorGUILayout.Popup(motionVectorModeEnumValue, Styles.MotionVectorModeNames, Styles.MotionVectorMode);
 
             EditorGUILayout.PropertyField(generateColliders);
+            EditorGUILayout.PropertyField(generateRigidbody);
         }
 
         static internal void ShowWindGUI(

Editor/Mono/AssetPipeline/SpeedTree/SpeedTreeImporterSettings.cs

@@ -48,6 +48,7 @@ internal class AdditionalSettings
     {
         public MotionVectorGenerationMode motionVectorModeEnumValue = MotionVectorGenerationMode.Object;
         public bool generateColliders = true;
+        public bool generateRigidbody = true;
     }
 
     [Serializable]

Editor/Mono/AssetPipeline/SpeedTreeImporter.bindings.cs

@@ -90,6 +90,11 @@ public extern bool isV8
         public extern int bestWindQuality { get; }
         public extern int selectedWindQuality { get; set; }
 
+        /////////////////////////////////////////////////////////////////////////////
+        // Physics settings
+
+        public extern bool generateRigidbody { get; set; }
+        public extern bool generateColliders { get; set; }
 
         /////////////////////////////////////////////////////////////////////////////
         // LOD settings

Editor/Mono/BuildPipeline/DataBuildDirtyTracker.cs

@@ -181,13 +181,21 @@ static public bool CheckDirty(string buildDataPath, BuildOptions buildOptions, s
             if (!buildReportPath.FileExists())
                 return true;
 
-            DataBuildDirtyTracker tracker = new DataBuildDirtyTracker()
+            try
             {
-                buildData = JsonUtility.FromJson<BuildData>(buildReportPath.ReadAllText()),
-                scenes = scenes,
-                buildOptions = buildOptions
-            };
-            return tracker.DoCheckDirty();
+                DataBuildDirtyTracker tracker = new DataBuildDirtyTracker()
+                {
+                    buildData = JsonUtility.FromJson<BuildData>(buildReportPath.ReadAllText()),
+                    scenes = scenes,
+                    buildOptions = buildOptions
+                };
+                return tracker.DoCheckDirty();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine($"Rebuilding Data files because the build data file is corrupt: {e}");
+                return true;
+            }
         }
     }
 }

Editor/Mono/BuildProfile/BuildProfileContext.cs

@@ -282,6 +282,9 @@ void OnEnable()
                     continue;
                 }
 
+                if (!BuildProfileModuleUtil.IsModuleInstalled(profileObj.moduleName, profileObj.subtarget))
+                    continue;
+
                 m_BuildModuleNameToClassicPlatformProfile.Add((profileObj.moduleName, profileObj.subtarget), profileObj);
                 classicPlatformProfiles.Add(profileObj);
             }

Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs

@@ -30,8 +30,6 @@ internal class BuildProfileModuleUtil
         {
             "Switch",
             "QNX",
-            "PS4",
-            "PS5"
         };
 
         /// <summary>

Editor/Mono/ContainerWindow.bindings.cs

@@ -35,8 +35,7 @@ internal partial class ContainerWindow
     {
         private const string k_ScriptingPrefix = "ContainerWindowBindings::";
 
-        // Pixel-position on screen.
-        public extern Rect position
+        extern Rect Internal_Position
         {
             [FreeFunction(k_ScriptingPrefix + "GetPosition", HasExplicitThis = true)] get;
             [FreeFunction(k_ScriptingPrefix + "SetPosition", HasExplicitThis = true)] set;