Merge branch 'main' into feature/mem-cat

Author: Sleitnick

Runtime/Code/Luau/LuauCoreCallbacks.cs

@@ -659,9 +659,9 @@ private static Delegate CreateSetter<T>(PropertyInfo propertyInfo, bool isStatic
     }
 
     private static T GetValue<T>(object instance, PropertyGetReflectionCache cacheData) {
-            if (typeof(T) == typeof(object)) {
+            // if (typeof(T) == typeof(object)) {
                 return (T) cacheData.propertyInfo.GetMethod.Invoke(instance, null);
-            }
+            // }
 
             if (!cacheData.HasGetPropertyFunc) {
                 var getMethod = cacheData.propertyInfo.GetGetMethod();
@@ -689,6 +689,9 @@ private static T GetValue<T>(object instance, PropertyGetReflectionCache cacheDa
     }
 
     private static void SetValue<T>(object instance, T value, PropertyInfo pi) {
+        pi.SetValue(instance, value);
+        return;
+        
         var staticSet = instance == null;
         if (!_propertySetterCache.TryGetValue((staticSet, pi.DeclaringType, pi.Name), out var setter)) {
             setter = CreateSetter<T>(pi, staticSet);

Runtime/Code/Misc/TubeRendererCS.cs

@@ -34,6 +34,7 @@ void Awake() {
 			}
 
 			_mesh = new Mesh();
+			_mesh.name = "Tube Mesh";
 			_meshFilter.mesh = _mesh;
 		}
 
@@ -78,7 +79,6 @@ public void SetPositions(Vector3[] positions) {
 
 		private void GenerateMesh() {
 			if (_mesh == null || _positions == null || _positions.Length <= 1) {
-				_mesh = new Mesh();
 				return;
 			}
 
@@ -117,6 +117,10 @@ private void GenerateMesh() {
 			_meshFilter.mesh = _mesh;
 		}
 
+		private void OnDestroy() {
+			Destroy(_mesh);
+		}
+
 		private Vector2[] GenerateUVs() {
 			var uvs = new Vector2[_positions.Length * _sides];
 

Runtime/Code/VoxelWorld/Editor/VoxelWorldEditor.cs

@@ -332,7 +332,14 @@ public override void OnInspectorGUI() {
 
         if (world.voxelWorldFile != null) {
             if (GUILayout.Button("Load")) {
-                Load(world);
+                if (world.hasUnsavedChanges) {
+                    if (EditorUtility.DisplayDialog("Discarding Changes",
+                            "Are you sure you want to discard unsaved changes to the Voxel World?", "Discard", "Cancel")) {
+                        Load(world);
+                    }
+                } else {
+                    Load(world);
+                }
             }
 
             if (world.chunks.Count > 0) {

Runtime/Code/VoxelWorld/VoxelMeshProcessor.cs

@@ -1544,7 +1544,8 @@ public static GameObject ProduceSingleBlock(int blockIndex, VoxelWorld world, fl
             meshRenderer.sharedMaterial = world.voxelBlocks.atlasMaterial;
 
             Mesh theMesh = new Mesh();
-
+            theMesh.name = "SingleBlock";
+            
             //Center around 0,0,0
             Vector3 origin = new Vector3(-0.5f, -0.5f, -0.5f);
             int flip = 0;

Runtime/Code/VoxelWorld/VoxelWorldChunk.cs

@@ -438,6 +438,13 @@ public void Clear() {
                         detailGameObjects[i] = null;
                     }
                 }
+
+                if (detailMeshes != null) {
+                    foreach (var detailMesh in detailMeshes) {
+                        Object.Destroy(detailMesh);
+                    }
+                }
+
                 obj = null;
             }
         }
@@ -550,8 +557,11 @@ private bool DoVisualUpdate(VoxelWorld world) {
                         obj.transform.localPosition = Vector3.zero;
                         obj.hideFlags = HideFlags.DontSaveInEditor | HideFlags.DontSaveInBuild;
                         obj.name = "Chunk";
-                        
-                        if (mesh == null) mesh = new Mesh();
+
+                        if (mesh == null) {
+                            mesh = new Mesh();
+                            mesh.name = "VoxelWorldChunk";
+                        }
                         // mesh.indexFormat = UnityEngine.Rendering.IndexFormat.UInt32; //Big boys
 
                         filter = obj.AddComponent<MeshFilter>();
@@ -597,6 +607,7 @@ private bool DoVisualUpdate(VoxelWorld world) {
                                 detailRenderers[i].shadowCastingMode = ShadowCastingMode.Off;
 
                                 detailMeshes[i] = new Mesh();
+                                detailMeshes[i].name = detailGameObjects[i].name;
                                 // detailMeshes[i].indexFormat = UnityEngine.Rendering.IndexFormat.UInt32; //Big boys
 
                                 detailFilters[i].mesh = detailMeshes[i];