diff --git a/AssetStudio/Classes/Mesh.cs b/AssetStudio/Classes/Mesh.cs index a3ad212..c4e1a9d 100644 --- a/AssetStudio/Classes/Mesh.cs +++ b/AssetStudio/Classes/Mesh.cs @@ -609,6 +609,7 @@ namespace AssetStudio if (version >= 2019) //2019 and up { var m_BonesAABBCount = reader.ReadInt32(); + reader.ThrowIfTooLarge(m_BonesAABBCount * 24); reader.Position += m_BonesAABBCount * 24; //skip MinMaxAABB[] m_BonesAABB var m_VariableBoneCountWeightsCount = reader.ReadInt32(); diff --git a/AssetStudioCLI/Options/CLIOptions.cs b/AssetStudioCLI/Options/CLIOptions.cs index 0075b04..72e9734 100644 --- a/AssetStudioCLI/Options/CLIOptions.cs +++ b/AssetStudioCLI/Options/CLIOptions.cs @@ -371,7 +371,7 @@ namespace AssetStudioCLI.Options optionDefaultValue: false, optionName: "--l2d-smooth-motions", optionDescription: "(Flag) If specified, Linear motion segments will be calculated as Bezier segments\n" + - "(May help if the exported motions look jerky/not smooth enough)", + "(May help if the exported motions look jerky/not smooth enough)\n", optionExample: "", optionHelpGroup: HelpGroups.Live2D, isFlag: true diff --git a/AssetStudioUtility/CubismLive2DExtractor/Live2DExtractor.cs b/AssetStudioUtility/CubismLive2DExtractor/Live2DExtractor.cs index 200ba37..eefc8ac 100644 --- a/AssetStudioUtility/CubismLive2DExtractor/Live2DExtractor.cs +++ b/AssetStudioUtility/CubismLive2DExtractor/Live2DExtractor.cs @@ -307,7 +307,10 @@ namespace CubismLive2DExtractor if (Texture2Ds.Count == 0) { - Logger.Warning($"No textures found for \"{modelName}\" model"); + var filterWarn = Options.SearchByFilename && Options.FilterTextures + ? "\nTry to export without filtering the Live2D textures" + : ""; + Logger.Warning($"No textures found for \"{modelName}\" model {filterWarn}"); } else {