Skip to content

Commit 8069d35

Browse files
committed
Automatic merge of T1.5.1-899-gf9d64a4dc and 14 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at 9c456aa: Blueprint/train car operations UI window - Pull request #885 at 8f94333: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #903 at 9bead33: Downloading route content (Github, zip) - Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR - Pull request #912 at d595703: New Triple Valve Features Vol. 2 - Pull request #917 at 644844a: Lighting Configuration Enhancements - Pull request #919 at 7aafe02: Added mouse wheel support for controls which can be moved by pressing t… - Pull request #920 at a94e403: Update RailDriver in Manual
16 parents fcf78d8 + f9d64a4 + 3539862 + d00beb9 + f92de76 + 9c456aa + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 9bead33 + 6834af0 + d595703 + 644844a + 7aafe02 + a94e403 commit 8069d35

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Source/RunActivity/Viewer3D/Lights.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,11 @@ public LightViewer(Viewer viewer, TrainCar car, TrainCarViewer carViewer)
112112
if (light.ShapeIndex != -1)
113113
{
114114
if (light.ShapeIndex < 0 || light.ShapeIndex >= (CarViewer as MSTSWagonViewer).TrainCarShape.XNAMatrices.Count())
115+
{
115116
Trace.TraceWarning("Light in car {0} has invalid shape index defined, shape index {1} does not exist",
116117
(Car as MSTSWagon).WagFilePath, light.ShapeIndex);
117-
light.ShapeIndex = 0;
118+
light.ShapeIndex = 0;
119+
}
118120
}
119121
else
120122
{

0 commit comments

Comments
 (0)