Skip to content

Commit 3729acd

Browse files
authored
Merge pull request #674 from Sharpe49/fix-wagon-smoke
Mark particle drawer texture for wagons
2 parents 9e0e99a + e160e26 commit 3729acd

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

Source/RunActivity/Viewer3D/ParticleEmitter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
148148
internal void Mark()
149149
{
150150
if (Material != null) // stops error messages if a special effect entry is not a defined OR parameter
151-
Material.Mark();
151+
Material.Mark();
152152
}
153153
}
154154

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,10 +355,6 @@ internal override void LoadForPlayer()
355355

356356
internal override void Mark()
357357
{
358-
foreach (var pdl in ParticleDrawers.Values)
359-
foreach (var pd in pdl)
360-
pd.Mark();
361-
362358
_CabRenderer?.Mark();
363359
ThreeDimentionCabViewer?.Mark();
364360

Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,6 +1389,14 @@ internal override void Mark()
13891389
FrontAirHoseDisconnectedShape?.Mark();
13901390
RearAirHoseShape?.Mark();
13911391
RearAirHoseDisconnectedShape?.Mark();
1392+
1393+
foreach (var pdl in ParticleDrawers.Values)
1394+
{
1395+
foreach (var pd in pdl)
1396+
{
1397+
pd.Mark();
1398+
}
1399+
}
13921400
}
13931401
}
13941402
}

0 commit comments

Comments
 (0)