Skip to content

Commit efef899

Browse files
committed
Automatic merge of T1.5.1-1741-gf80cfb5d1 and 21 pull requests
- Pull request #570 at 362e4e7: glTF 2.0 support with PBR lighting - Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter - Pull request #1052 at 3b5cb90: Content Manager: Add axle count, and lowest derail force - Pull request #1062 at bbc0013: Train Forces popup Window. - Pull request #1064 at cb510d6: Add Train Info tab to Help window (F1) - Pull request #1066 at 62c89c1: Log derailment, using TraceInformation. - Pull request #1082 at a3128ae: Allow variable water level in glass gauge - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #1049 at 6a0c471: Re-organise document storage and access - Pull request #1057 at 84592f7: Switchable brake system - Pull request #1069 at 99fc9ac: Mouse wheel control only with Alt – Followup for #1051 - Pull request #1070 at f818e40: Fix a NullReferenceException in TCS scripts - Pull request #1071 at 722dd3f: Change cover image for v1.6 - Pull request #1074 at e9a66c1: Gradient - commit 2024-16-12 - Pull request #1076 at 3bbd537: Allow depart early - Pull request #1077 at 7e73abd: Fix SME brakes not working - Pull request #1078 at 9ab642e: Default PowerSupply script for steam locomotives - Pull request #1079 at 5e37059: Adds Polish transations - Pull request #1080 at a637cb8: arranges Options > System tab for longer texts - Pull request #1083 at 7e6fb60: Menu contents route name clash - Pull request #1081 at 689494b: Brake cuts power unification
23 parents 3dcf086 + f80cfb5 + 362e4e7 + d3ae4a2 + 3b5cb90 + bbc0013 + cb510d6 + 62c89c1 + a3128ae + 1f5ba4c + 6a0c471 + 84592f7 + 99fc9ac + f818e40 + 722dd3f + e9a66c1 + 3bbd537 + 7e73abd + 9ab642e + 5e37059 + a637cb8 + 7e6fb60 + 689494b commit efef899

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Source/RunActivity/Viewer3D/Shapes.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2734,7 +2734,8 @@ public virtual Matrix GetMatrixProduct(int iNode)
27342734
/// </summary>
27352735
/// <param name="animationId">For stf files it is the node id, for gltf files it is the animation id.</param>
27362736
/// <returns>true if there is no internal seqence defined in the shape.</returns>
2737-
public virtual bool IsAnimationArticulation(int animationId) => Animations?.FirstOrDefault()?.anim_nodes?.ElementAtOrDefault(animationId)?.controllers.Count == 0;
2737+
public virtual bool IsAnimationArticulation(int animationId) =>
2738+
!(Animations?.FirstOrDefault()?.anim_nodes is anim_nodes a && a.Count > animationId && a.ElementAtOrDefault(animationId)?.controllers is controllers c && c.Count > 0);
27382739

27392740
/// <summary>
27402741
/// Returns the parent animation id.

0 commit comments

Comments
 (0)