Merge branch 'master' into release

leezer3 · Jun 14, 2018 · 70a8b6e · 70a8b6e
2 parents cb05fba + be0979c
commit 70a8b6e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/source/ObjectViewer/Parsers/AnimatedObjectParser.cs b/source/ObjectViewer/Parsers/AnimatedObjectParser.cs
@@ -501,6 +501,7 @@ internal static ObjectManager.AnimatedObjectCollection ReadObject(string FileNam
 											Result.Objects[ObjectCount].States[k].Object = ObjectManager.LoadStaticObject(StateFiles[k], Encoding, LoadMode, false, ForceTextureRepeatX, ForceTextureRepeatY);
 											if (Result.Objects[ObjectCount].States[k].Object != null)
 											{
+												Result.Objects[ObjectCount].States[k].Position = Position;
 												Result.Objects[ObjectCount].States[k].Object.Dynamic = true;
 												for (int l = 0; l < Result.Objects[ObjectCount].States[k].Object.Mesh.Materials.Length; l++)
 												{

diff --git a/source/OpenBVE/Parsers/Panel/Panel2CfgParser.cs b/source/OpenBVE/Parsers/Panel/Panel2CfgParser.cs
@@ -974,6 +974,10 @@ internal static void ParsePanel2Config(string PanelFile, string TrainPath, Syste
 										double cy = 0.25 * (y0 + y1 + y2 + y3);
 										double cz = 0.25 * (z0 + z1 + z2 + z3);
 										VertexTemplate[] vertices = new VertexTemplate[11];
+										for (int v = 0; v < 11; v++)
+										{
+											vertices[v] = new Vertex();
+										}
 										int[][] faces = new int[][] {
 											new int[] { 0, 1, 2 },
 											new int[] { 0, 3, 4 },