@@ -586,10 +586,7 @@ public Dictionary<int, Dictionary<int, ColladaData>> ReadColladaFile(XivMdl xivM
586
586
{
587
587
vertexIndexDict . Add ( "normal" , inputOffset ) ;
588
588
}
589
- else if ( semantic . Equals ( "color" ) )
590
- {
591
- vertexIndexDict . Add ( "vertexColor" , inputOffset ) ;
592
- }
589
+
593
590
else if ( semantic . Equals ( "textangent" ) && ( source . Contains ( "map0" ) || source . Contains ( "map1" ) ) )
594
591
{
595
592
vertexIndexDict . Add ( "tangent" , inputOffset ) ;
@@ -614,6 +611,10 @@ public Dictionary<int, Dictionary<int, ColladaData>> ReadColladaFile(XivMdl xivM
614
611
{
615
612
vertexIndexDict . Add ( "vertexAlpha" , inputOffset ) ;
616
613
}
614
+ else if ( semantic . Equals ( "color" ) )
615
+ {
616
+ vertexIndexDict . Add ( "vertexColor" , inputOffset ) ;
617
+ }
617
618
}
618
619
else if ( toolType == ToolType . Blender )
619
620
{
@@ -629,6 +630,10 @@ public Dictionary<int, Dictionary<int, ColladaData>> ReadColladaFile(XivMdl xivM
629
630
{
630
631
vertexIndexDict . Add ( "vertexAlpha" , inputOffset ) ;
631
632
}
633
+ else if ( semantic . Equals ( "color" ) && ! vertexIndexDict . ContainsKey ( "vertexColor" ) )
634
+ {
635
+ vertexIndexDict . Add ( "vertexColor" , inputOffset ) ;
636
+ }
632
637
}
633
638
else if ( toolType == ToolType . OpenCOLLADA )
634
639
{
@@ -644,6 +649,10 @@ public Dictionary<int, Dictionary<int, ColladaData>> ReadColladaFile(XivMdl xivM
644
649
{
645
650
vertexIndexDict . Add ( "vertexAlpha" , inputOffset ) ;
646
651
}
652
+ else if ( semantic . Equals ( "color" ) )
653
+ {
654
+ vertexIndexDict . Add ( "vertexColor" , inputOffset ) ;
655
+ }
647
656
}
648
657
else
649
658
{
0 commit comments