Merge pull request daz3d#23 from David-Vodhanel/master

Added David's Changes
David-Vodhanel · Jul 5, 2021 · 0acc682 · 0acc682
2 parents ca3b315 + 5821de3
commit 0acc682
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/Unreal/UnrealPlugin/DazToUnreal/Source/DazToUnreal/Private/DazToUnreal.cpp b/Unreal/UnrealPlugin/DazToUnreal/Source/DazToUnreal/Private/DazToUnreal.cpp
@@ -579,6 +579,7 @@ UObject* FDazToUnrealModule::ImportFromDaz(TSharedPtr<FJsonObject> JsonObject)
 	 // Daz Studio puts the base bone rotations in a different place than Unreal expects them.
 	 if (CachedSettings->FixBoneRotationsOnImport && AssetType == DazAssetType::SkeletalMesh && RootBone)
 	 {
+		FDazToUnrealFbx::RemoveBindPoses(Scene);
 		FDazToUnrealFbx::FixClusterTranformLinks(Scene, RootBone);
 	 }
 

diff --git a/Unreal/UnrealPlugin/DazToUnreal/Source/DazToUnreal/Private/DazToUnrealFbx.cpp b/Unreal/UnrealPlugin/DazToUnreal/Source/DazToUnreal/Private/DazToUnrealFbx.cpp
@@ -70,6 +70,13 @@ void FDazToUnrealFbx::FixClusterTranformLinks(FbxScene* Scene, FbxNode* RootNode
 		FixClusterTranformLinks(Scene, ChildNode);
 	}
 }
+void FDazToUnrealFbx::RemoveBindPoses(FbxScene* Scene)
+{
+	for (int32 PoseIndex = Scene->GetPoseCount() - 1; PoseIndex >= 0; --PoseIndex)
+	{
+		Scene->RemovePose(PoseIndex);
+	}
+}
 
 void FDazToUnrealFbx::AddWeightsToAllNodes(FbxNode* Parent)
 {

diff --git a/Unreal/UnrealPlugin/DazToUnreal/Source/DazToUnreal/Public/DazToUnrealFbx.h b/Unreal/UnrealPlugin/DazToUnreal/Source/DazToUnreal/Public/DazToUnrealFbx.h
@@ -61,6 +61,7 @@ class FDazToUnrealFbx
 public:
 	static void RenameDuplicateBones(FbxNode* RootNode);
 	static void FixClusterTranformLinks(FbxScene* Scene, FbxNode* RootNode);
+	static void RemoveBindPoses(FbxScene* Scene);
 	static void AddWeightsToAllNodes(FbxNode* Parent);
 private:
 	static void RenameDuplicateBones(FbxNode* RootNode, TMap<FString, int>& ExistingBones);