Skip to content

Commit bb17bd0

Browse files
committed
Automatic merge of T1.5.1-776-g362e836a2 and 16 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 a055bca: Blueprint/train car operations UI window - Pull request #885 at d9ce84b: 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 #893 at bf8876b: Signal errors - Pull request #894 at 5ff1e73: Correct Decrease Colour - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #897 at 0a9d939: feat: Improved system information collection - Pull request #899 at e5db0a2: Duplex steam engines - Booster Engine addition - Pull request #903 at a0d2991: first phase downloading from Github - Pull request #904 at 71beb33: fix: adds downgrade to low precision - Pull request #906 at 0e0aa8b: Bug fix for https://bugs.launchpad.net/or/+bug/2047299 Crash loading a 3Dcab-only loco - Pull request #907 at 54d1119: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel
18 parents 9f8cc72 + 362e836 + 3539862 + d00beb9 + f92de76 + a055bca + d9ce84b + 6c0785b + 1f5ba4c + bf8876b + 5ff1e73 + 5866028 + 0a9d939 + e5db0a2 + a0d2991 + 71beb33 + 0e0aa8b + 54d1119 commit bb17bd0

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

Source/RunActivity/Viewer3D/DynamicTrack.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,17 @@ public static PitchControls GetPitchControl(string sPitchControl)
710710

711711
}
712712
}
713+
714+
/// <summary>
715+
/// Marks the generic track profile, so that its textures never get deleted
716+
/// </summary>
717+
[CallOnThread("Loader")]
718+
public void Mark()
719+
{
720+
foreach (LOD lod in LODs)
721+
lod.Mark();
722+
}
723+
713724
}
714725

715726
public class LOD

Source/RunActivity/Viewer3D/World.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ public void Load()
116116
Precipitation.Mark();
117117
Terrain.Mark();
118118
Scenery.Mark();
119+
Viewer.TRP?.TrackProfile?.Mark();
120+
Viewer.TRP?.TrackProfileTun?.Mark();
119121
Trains.Mark();
120122
RoadCars.Mark();
121123
Containers.Mark();

0 commit comments

Comments
 (0)