A few small fixes

ouczbs · Jul 1, 2021 · e879659 · e879659
1 parent 6238ca3
commit e879659
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/Unreal/UnrealMesh/UnAnim4.cpp b/Unreal/UnrealMesh/UnAnim4.cpp
@@ -748,8 +748,6 @@ void USkeleton::ConvertAnims(UAnimSequence4* Seq)
 //	DBG("----------- Skeleton %s: %d seq, %d bones -----------\n", Name, Anims.Num(), ReferenceSkeleton.RefBoneInfo.Num());
 
 	int NumTracks = Seq->GetNumTracks();
-	// Store UAnimSequence in 'OriginalAnims' array, we just need it from time to time
-	OriginalAnims.Add(Seq);
 
 #if DEBUG_DECOMPRESS
 	appPrintf("Sequence %s: %d bones, %d offsets (%g per bone), %d frames, %d compressed data\n"
@@ -809,6 +807,9 @@ void USkeleton::ConvertAnims(UAnimSequence4* Seq)
 		return;
 	}
 
+	// Store UAnimSequence in 'OriginalAnims' array, we just need it from time to time
+	OriginalAnims.Add(Seq);
+
 	// Create CAnimSequence
 	CAnimSequence *Dst = new CAnimSequence(Seq);
 	AnimSet->Sequences.Add(Dst);

diff --git a/Unreal/UnrealMesh/UnMesh4.cpp b/Unreal/UnrealMesh/UnMesh4.cpp
@@ -295,6 +295,13 @@ struct FStaticMeshVertexBuffer4
 	USkeletalMesh
 -----------------------------------------------------------------------------*/
 
+// FSkeletalMeshLODInfo is in cpp file to let use forward declaration of some types
+FSkeletalMeshLODInfo::FSkeletalMeshLODInfo()
+{}
+
+FSkeletalMeshLODInfo::~FSkeletalMeshLODInfo()
+{}
+
 struct FRecomputeTangentCustomVersion
 {
 	enum Type
@@ -850,7 +857,7 @@ struct FSkelMeshSection4
 		if (Ar.Game == GAME_Paragon) return;
 #endif
 
-		if (Ar.Game < GAME_UE4(27) || !StripFlags.IsClassDataStripped(1)) // DuplicatedVertices
+		if (Ar.Game < GAME_UE4(23) || !StripFlags.IsClassDataStripped(1)) // DuplicatedVertices, introduced in UE4.23
 		{
 			FDuplicatedVerticesBuffer DuplicatedVerticesBuffer;
 			Ar << DuplicatedVerticesBuffer;
@@ -2142,13 +2149,6 @@ UStaticMesh4::~UStaticMesh4()
 	delete ConvertedMesh;
 }
 
-FSkeletalMeshLODInfo::FSkeletalMeshLODInfo()
-{}
-
-FSkeletalMeshLODInfo::~FSkeletalMeshLODInfo()
-{}
-
-
 // Ambient occlusion data
 // When changed, constant DISTANCEFIELD_DERIVEDDATA_VER TEXT is updated
 struct FDistanceFieldVolumeData