Forgot check for MSTSFreightAnimEnabled

Author: SteelFill

Source/Documentation/Manual/features-rollingstock.rst

@@ -439,7 +439,8 @@ no arguments are specified (ie: ``ORTSAutoSize ()`` was entered in the Wagon sec
 offsets are assumed to be 0 meters.
 
 Note that automatic sizing uses the nearest LOD of the main shape file and attached freight animations. LODs for further
-distances have no effect on the automatic sizing. :ref:`Shape descriptor overrides <features-shape-manipulation>`
+distances have no effect on the automatic sizing. Freight animations using the ``ShapeHierarchy`` feature are also
+skipped due to potential unintended behaviors. :ref:`Shape descriptor overrides <features-shape-manipulation>`
 are also not considered at this phase, so if any changes are made in the .sd file, this feature may not provide
 good results. This method also works best for rolling stock with standard buffers/couplers on each end.
 Automatic sizing generally can't produce reasonable results for articulated rolling stock. And should something go

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -460,21 +460,14 @@ public virtual void LoadFromWagFile(string wagFilePath)
 
                     (Vector3 mainMins, Vector3 mainMaxes) = wagShape.GetBoundingLimits();
 
-                    // Repeat for MSTS freight animation bounds
-                    if (!string.IsNullOrEmpty(FreightShapeFileName))
-                    {
-                        ShapeFile freightShape = new ShapeFile(wagonFolderSlash + FreightShapeFileName, true);
-
-                        (Vector3 freightMins, Vector3 freightMaxes) = freightShape.GetBoundingLimits();
-
-                        // MSTS freight animations don't have offsets, so can be simply compared
-                        mainMins = Vector3.Min(mainMins, freightMins);
-                        mainMaxes = Vector3.Max(mainMaxes, freightMaxes);
-                    }
+                    bool mstsFreightAnim = true;
 
                     // And also repeat for ORTS freight animations
                     if (FreightAnimations != null)
                     {
+                        if (!FreightAnimations.MSTSFreightAnimEnabled)
+                            mstsFreightAnim = false;
+
                         foreach (var freightAnim in FreightAnimations.Animations)
                         {
                             // We will ignore freight animations not attached to the main shape object for simplicity
@@ -512,6 +505,18 @@ public virtual void LoadFromWagFile(string wagFilePath)
                         }
                     }
 
+                    // And also repeat for MSTS freight animation bounds (if enabled)
+                    if (mstsFreightAnim && !string.IsNullOrEmpty(FreightShapeFileName))
+                    {
+                        ShapeFile freightShape = new ShapeFile(wagonFolderSlash + FreightShapeFileName, true);
+
+                        (Vector3 freightMins, Vector3 freightMaxes) = freightShape.GetBoundingLimits();
+
+                        // MSTS freight animations don't have offsets, so can be simply compared
+                        mainMins = Vector3.Min(mainMins, freightMins);
+                        mainMaxes = Vector3.Max(mainMaxes, freightMaxes);
+                    }
+
                     // Set dimensions of wagon if configured as such
                     if (AutoSize)
                     {