Fix incorrect number of mesh colors extracted before 2018

* This affected GLB export and Static Mesh Separation
AssetRipper · Feb 20, 2024 · 669a55d · 669a55d
1 parent f52342b
commit 669a55d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Source/AssetRipper.SourceGenerated.Extensions/VertexDataExtensions.cs b/Source/AssetRipper.SourceGenerated.Extensions/VertexDataExtensions.cs
@@ -124,17 +124,19 @@ public static ChannelInfo GetChannel(this IVertexData instance, UnityVersion ver
 			for (int chn = 0; chn < channels.Count; chn++)
 			{
 				ChannelInfo m_Channel = channels[chn];
+
+				if (version.LessThan(2018) && chn == 2 && m_Channel.Format == 2) //kShaderChannelColor && kChannelFormatColor
+				{
+					m_Channel.SetDataDimension(4);
+				}
+
 				byte dimension = m_Channel.GetDataDimension();
 				if (dimension > 0)
 				{
 					IStreamInfo m_Stream = streams[m_Channel.Stream];
 					BitArray channelMask = new BitArray(BitConverter.GetBytes(m_Stream.ChannelMask));
 					if (channelMask.Get(chn))
 					{
-						if (version.LessThan(2018) && chn == 2 && m_Channel.Format == 2) //kShaderChannelColor && kChannelFormatColor
-						{
-							m_Channel.SetDataDimension(4);
-						}
 
 						MeshHelper.VertexFormat vertexFormat = MeshHelper.ToVertexFormat(m_Channel.Format, version);
 						int componentByteSize = MeshHelper.GetFormatSize(vertexFormat);