Skip to content

Commit 7ad335c

Browse files
committed
Automatic merge of T1.5.1-1695-gade019506 and 16 pull requests
- Pull request #570 at b885667: glTF 2.0 support with PBR lighting - Pull request #900 at 4629736: DMI in 3D cab + two more dials - Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter - Pull request #1045 at cc4d53c: Bugfix: Empty Start Time for Explore, and other issues loading from Menu Selection and Content Routes - Pull request #1052 at 5bbc476: Content Manager: Add axle count, and lowest derail force - Pull request #1062 at 3b18c48: Train Forces popup Window. - Pull request #1064 at 9b3415e: Add Train Info tab to Help window (F1) - Pull request #1066 at 62c89c1: Log derailment, using TraceInformation. - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #1000 at d8d9709: Locomotive operation from control car - Pull request #1029 at 92c74ef: Superelevation Follow Up Fixes - Pull request #1057 at 50c3789: Switchable brake system - Pull request #1069 at 3f153f0: Mouse wheel control only with Alt – Followup for #1051 - Pull request #1055 at f6bf9fa: Route Based TTrack Sounds - Pull request #896 at f1681df: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #1049 at 4dd8c4f: Re-organise document storage and access
18 parents 3658313 + ade0195 + b885667 + 4629736 + d3ae4a2 + cc4d53c + 5bbc476 + 3b18c48 + 9b3415e + 62c89c1 + 1f5ba4c + d8d9709 + 92c74ef + 50c3789 + 3f153f0 + f6bf9fa + f1681df + 4dd8c4f commit 7ad335c

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -3467,8 +3467,7 @@ public ThreeDimentionCabViewer(Viewer viewer, MSTSLocomotive car, MSTSLocomotive
34673467
break;
34683468
}
34693469

3470-
// This is the case for .s files, for glTF-s it will not be true
3471-
var targetNode = iMatrix;
3470+
var targetNode = TrainCarShape.SharedShape.GetAnimationTargetNode(iMatrix);
34723471

34733472
if (style != null && style is CabViewDigitalRenderer)//digits?
34743473
{

0 commit comments

Comments
 (0)