Skip to content

Commit d59a9df

Browse files
committed
Update 2.0.11.15
2 parents 5290630 + 277a9d2 commit d59a9df

File tree

2 files changed

+269
-158
lines changed

2 files changed

+269
-158
lines changed

xivModdingFramework/Models/FileTypes/Dae.cs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -586,10 +586,7 @@ public Dictionary<int, Dictionary<int, ColladaData>> ReadColladaFile(XivMdl xivM
586586
{
587587
vertexIndexDict.Add("normal", inputOffset);
588588
}
589-
else if (semantic.Equals("color"))
590-
{
591-
vertexIndexDict.Add("vertexColor", inputOffset);
592-
}
589+
593590
else if (semantic.Equals("textangent") && (source.Contains("map0") || source.Contains("map1")))
594591
{
595592
vertexIndexDict.Add("tangent", inputOffset);
@@ -614,6 +611,10 @@ public Dictionary<int, Dictionary<int, ColladaData>> ReadColladaFile(XivMdl xivM
614611
{
615612
vertexIndexDict.Add("vertexAlpha", inputOffset);
616613
}
614+
else if (semantic.Equals("color"))
615+
{
616+
vertexIndexDict.Add("vertexColor", inputOffset);
617+
}
617618
}
618619
else if (toolType == ToolType.Blender)
619620
{
@@ -629,6 +630,10 @@ public Dictionary<int, Dictionary<int, ColladaData>> ReadColladaFile(XivMdl xivM
629630
{
630631
vertexIndexDict.Add("vertexAlpha", inputOffset);
631632
}
633+
else if (semantic.Equals("color") && !vertexIndexDict.ContainsKey("vertexColor"))
634+
{
635+
vertexIndexDict.Add("vertexColor", inputOffset);
636+
}
632637
}
633638
else if (toolType == ToolType.OpenCOLLADA)
634639
{
@@ -644,6 +649,10 @@ public Dictionary<int, Dictionary<int, ColladaData>> ReadColladaFile(XivMdl xivM
644649
{
645650
vertexIndexDict.Add("vertexAlpha", inputOffset);
646651
}
652+
else if (semantic.Equals("color"))
653+
{
654+
vertexIndexDict.Add("vertexColor", inputOffset);
655+
}
647656
}
648657
else
649658
{

0 commit comments

Comments
 (0)