Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2024-11-30 18:24:39 +01:00
Code Releases Wiki Activity

Another importing fix from my stupid mistakes

Browse Source
This commit is contained in:
KillzXGaming 2019-07-05 19:28:49 -04:00
parent b10aaed86e
commit f5e7996bd3
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/.suo
View File

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
View File

Binary file not shown.

19
Switch_Toolbox_Library/FileFormats/Assimp/Assimp.cs
View File

@ -202,7 +202,16 @@ namespace Switch_Toolbox.Library
if (scene.RootNode != null)
{
var idenity = Matrix4x4.Identity;
BuildSkeletonNodes(scene.RootNode, BoneNames, skeleton, ref idenity);
var SklRoot = GetSklRoot(scene.RootNode, BoneNames);
if (SklRoot != null)
{
BuildSkeletonNodes(SklRoot, BoneNames, skeleton, ref idenity);
}
else
{
BuildSkeletonNodes(scene.RootNode, BoneNames, skeleton, ref idenity);
}
skeleton.update();
skeleton.reset();
@ -482,16 +491,8 @@ namespace Switch_Toolbox.Library
{
if (node.HasChildren)
{
var SklRoot = GetSklRoot(node, boneNames);
if (SklRoot != null)
{
BuildSkeletonNodes(SklRoot, boneNames, skeleton, ref world);
}
else
{
foreach (Node child in node.Children)
BuildSkeletonNodes(child, boneNames, skeleton, ref world);
}
}
}
}