Fix an issue causing a lot of invalid solids when opening OBJ files

LogicAndTrick · Jun 15, 2014 · 6b868aa · 6b868aa
1 parent 4c56285
commit 6b868aa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/Sledge.Editor/Tools/EntityTool.cs b/Sledge.Editor/Tools/EntityTool.cs
@@ -73,6 +73,10 @@ public override void DocumentChanged()
 
         private void BuildMenu()
         {
+            if (_menu != null) foreach (var item in _menu) item.Dispose();
+            _menu = null;
+            if (Document == null) return;
+
             var items = new List<ToolStripItem>();
             var classes = Document.GameData.Classes.Where(x => x.ClassType != ClassType.Base && x.ClassType != ClassType.Solid).ToList();
             var groups = classes.GroupBy(x => x.Name.Split('_')[0]);

diff --git a/Sledge.Editor/Tools/TextureTool/TextureToolSidebarPanel.Designer.cs b/Sledge.Editor/Tools/TextureTool/TextureToolSidebarPanel.Designer.cs
diff --git a/Sledge.Providers/Map/ObjProvider.cs b/Sledge.Providers/Map/ObjProvider.cs
@@ -254,7 +254,8 @@ private Solid SolidifyFace(DataStructures.MapObjects.Map map, Face face)
             solid.Colour = Colour.GetRandomBrushColour();
             solid.Faces.Add(face);
             face.Parent = solid;
-            var offset = face.BoundingBox.Center - face.Plane.Normal * 5;
+            var center = face.Vertices.Aggregate(Coordinate.Zero, (sum, v) => sum + v.Location) / face.Vertices.Count;
+            var offset = center - face.Plane.Normal * 5;
             for (var i = 0; i < face.Vertices.Count; i++)
             {
                 var v1 = face.Vertices[i];