Skip to content

Commit e6086e9

Browse files
committed
Automatic merge of T1.5.1-1080-g433d161cdb and 20 pull requests
- Pull request #891 at 9a1d6b2: Auto save - Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #882 at 8f695a4: Blueprint/train car operations UI window - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #922 at a3bc9e7: Autopilot for timetable mode - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #962 at 46d0472: Fix pantographs on unpowered cars - Pull request #965 at 7554f02: style: Renormalize line endings - Pull request #969 at 93424fa: Bugfix refocus to the main window when opening the map window - Pull request #900 at c27f32d: DMI updates - Pull request #799 at dfc715e: Consolidated wind simulation - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #885 at e267870: feat: Add notifications to Menu - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #903 at 3e390b8: Downloading route content (Github, zip) - Pull request #946 at 91a03af: Advanced track sounds - Pull request #952 at 8347095: Investigation - Pulsing graphics - Pull request #954 at f837ffd: Add Support for Multiple Track Profiles - Pull request #968 at 1ccdf71: Initial build of adding track section identifier for rack railway
22 parents 6c096bd + 433d161 + 9a1d6b2 + 2452cb0 + d00beb9 + 8f695a4 + 1f5ba4c + a3bc9e7 + a519452 + 46d0472 + 7554f02 + 93424fa + c27f32d + dfc715e + f92de76 + e267870 + 5866028 + 3e390b8 + 91a03af + 8347095 + f837ffd + 1ccdf71 commit e6086e9

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Source/RunActivity/Viewer3D/Shapes.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,9 @@ public PoseableShape(Viewer viewer, string path, WorldPosition initialPosition,
279279
{
280280
if (SharedShape.Matrices.Length > 0)
281281
{
282-
XNAMatrices = new Matrix[SharedShape.Matrices.Length];
283-
for (int iMatrix = 0; iMatrix < SharedShape.Matrices.Length; ++iMatrix)
284-
XNAMatrices[iMatrix] = SharedShape.Matrices[iMatrix];
282+
XNAMatrices = new Matrix[SharedShape.Matrices.Length];
283+
for (int iMatrix = 0; iMatrix < SharedShape.Matrices.Length; ++iMatrix)
284+
XNAMatrices[iMatrix] = SharedShape.Matrices[iMatrix];
285285
}
286286
else // If the shape file is missing or fails to load, we need some default data to prevent crashes
287287
{
@@ -2307,8 +2307,8 @@ public SubObject(sub_object sub_object, ref int totalPrimitiveIndex, int[] hiera
23072307
if (imageName.ToUpper().Contains(nameof(CABViewControlTypes.ORTS_ETCS)))
23082308
material = sharedShape.Viewer.MaterialManager.Load("Screen", Helpers.GetTextureFile(sharedShape.Viewer.Simulator, Helpers.TextureFlags.None, sharedShape.ReferencePath, imageName));
23092309
else
2310-
material = sharedShape.Viewer.MaterialManager.Load("Scenery", Helpers.GetTextureFile(sharedShape.Viewer.Simulator, textureFlags, sharedShape.ReferencePath, imageName), (int)options, texture.MipMapLODBias);
2311-
}
2310+
material = sharedShape.Viewer.MaterialManager.Load("Scenery", Helpers.GetTextureFile(sharedShape.Viewer.Simulator, textureFlags, sharedShape.ReferencePath, imageName), (int)options, texture.MipMapLODBias);
2311+
}
23122312
}
23132313
else
23142314
{

0 commit comments

Comments
 (0)