Skip to content

Commit ded919f

Browse files
committed
Automatic merge of T1.5.1-1201-g5d239654f2 and 18 pull requests
- Pull request #799 at dfc715e: Consolidated wind simulation - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #885 at 8f473ce: feat: Add notifications to Menu - Pull request #891 at 9a1d6b2: Auto save - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #952 at 8347095: Investigation - Pulsing graphics - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #954 at e715fa4: Multiple Track Profiles & Superelevation Improvements - Pull request #962 at 46d0472: Fix pantographs on unpowered cars - Pull request #972 at e90a2aa: On Map window color changed switch or signal is not changed - Pull request #980 at a7406de: Downloading route content (Github, zip) second part - Pull request #981 at 48f1939: Multiple type trainset lightglows - Pull request #982 at efcf19c: WEB based Switch Panel enhancement: Alerter - Pull request #983 at 202316e: WEB based Switch Panel bug: DPU window - Pull request #984 at 0f8122e: Player train switching for timetable mode - Pull request #985 at 4f42995: Correct bug with steam locomotive chuffing sound - Pull request #900 at c27f32d: DMI updates - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
20 parents d5b0fd9 + 5d23965 + dfc715e + d00beb9 + 8f473ce + 9a1d6b2 + 1f5ba4c + 8347095 + a519452 + e715fa4 + 46d0472 + e90a2aa + a7406de + 48f1939 + efcf19c + 202316e + 0f8122e + 4f42995 + c27f32d + f92de76 commit ded919f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Source/RunActivity/Viewer3D/Lights.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ public LightViewer(Viewer viewer, TrainCar car, TrainCarViewer carViewer)
105105
LightPrimitives.Add(new LightGlowPrimitive(this, Viewer.RenderProcess, light));
106106
if (light.Graphic != null)
107107
(LightPrimitives.Last() as LightGlowPrimitive).SpecificGlowMaterial = viewer.MaterialManager.Load("LightGlow", DefineFullTexturePath(light.Graphic));
108+
else
109+
(LightPrimitives.Last() as LightGlowPrimitive).SpecificGlowMaterial = LightGlowMaterial;
108110
break;
109111
case LightType.Cone:
110112
LightPrimitives.Add(new LightConePrimitive(this, Viewer.RenderProcess, light));

0 commit comments

Comments
 (0)