mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-05-27 22:00:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug

Browse Source
This commit is contained in:
Perfare 2019-06-09 07:44:50 +08:00
parent b9cf7d5874
commit 6b93df41f2
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
AssetStudio/Classes/Mesh.cs
View File

@ -264,7 +264,7 @@ namespace AssetStudio
if (m_Channels.FirstOrDefault(x => x.dimension > 4) != null) if (m_Channels.FirstOrDefault(x => x.dimension > 4) != null)
{ {
var fixStream = m_Channels.Max(x => x.stream); var fixStream = m_Channels.Max(x => x.stream);
var fixChannels = m_Channels.Where(x => x.stream == fixStream).ToArray(); var fixChannels = m_Channels.Where(x => x.dimension > 0 && x.stream == fixStream).ToArray();
var stride = 0; var stride = 0;
for (int i = 1, l = fixChannels.Length; i < l; i++) for (int i = 1, l = fixChannels.Length; i < l; i++)
{ {
@ -687,11 +687,6 @@ namespace AssetStudio
private void ProcessData() private void ProcessData()
{ {
//Fix channel after 2018.3
if (version[0] > 2018 || (version[0] == 2018 && version[1] >= 3))
{
m_VertexData.FixChannel();
}
if (!string.IsNullOrEmpty(m_StreamData?.path)) if (!string.IsNullOrEmpty(m_StreamData?.path))
{ {
if (m_VertexData.m_VertexCount > 0) if (m_VertexData.m_VertexCount > 0)
@ -700,7 +695,11 @@ namespace AssetStudio
m_VertexData.m_DataSize = resourceReader.GetData(); m_VertexData.m_DataSize = resourceReader.GetData();
} }
} }
//Fix channel after 2018.3
if (version[0] > 2018 || (version[0] == 2018 && version[1] >= 3))
{
m_VertexData.FixChannel();
}
if (version[0] > 3 || (version[0] == 3 && version[1] >= 5)) //3.5 and up if (version[0] > 3 || (version[0] == 3 && version[1] >= 5)) //3.5 and up
{ {
ReadVertexData(); ReadVertexData();