Fix static mesh cyclic dependency

Author: mircearoata

AssetDumper/Source/AssetDumper/Private/Toolkit/AssetTypes/FbxMeshExporter.cpp

@@ -860,6 +860,9 @@ void FFbxMeshExporter::ExportSkeletalMesh(const FSkeletalMeshLODRenderData& Skel
         const uint32 NumTriangles = MeshSection.NumTriangles;
         const uint32 StartVertexIndex = MeshSection.BaseIndex;
 
+    	if (!ensure(ReferencedMaterials.IsValidIndex(MeshSection.MaterialIndex)))
+    		continue;
+    	
         //Create dummy material for this section
         const FString MaterialSlotName = ReferencedMaterials[MeshSection.MaterialIndex].MaterialSlotName.ToString();
         const int32 MaterialIndex = ExportDummyMaterialIntoFbxScene(MaterialSlotName, MeshNode);

AssetGenerator/Source/AssetGenerator/Private/Toolkit/AssetTypeGenerator/StaticMeshGenerator.cpp

@@ -206,9 +206,23 @@ void UStaticMeshGenerator::PopulateStageDependencies(TArray<FPackageDependency>&
 		const TArray<TSharedPtr<FJsonValue>>& Materials = AssetData->GetArrayField(TEXT("Materials"));
 		const int32 NavCollisionObjectIndex = AssetData->GetIntegerField(TEXT("NavCollision"));
 		const int32 BodySetupObjectIndex = AssetData->GetIntegerField(TEXT("BodySetup"));
+
+		const TArray<TSharedPtr<FJsonValue>> AssetUserDataObjects = AssetObjectProperties->GetArrayField(TEXT("AssetUserData"));
+
+		TArray<int32> AssetUserDataObjectIndices;
+		for (const TSharedPtr<FJsonValue>& ObjectIndexValue : AssetUserDataObjects) {
+			AssetUserDataObjectIndices.Add((int32) ObjectIndexValue->AsNumber());
+		}
 
 		TArray<FString> OutReferencedPackages;
-		GetObjectSerializer()->CollectReferencedPackages(ReferencedObjects, OutReferencedPackages);
+		for (const TSharedPtr<FJsonValue>& ObjectIndexValue : ReferencedObjects) {
+			const int32 ObjectIndex = (int32) ObjectIndexValue->AsNumber();
+
+			if (!AssetUserDataObjectIndices.Contains(ObjectIndex)) {
+				GetObjectSerializer()->CollectObjectPackages(ObjectIndex, OutReferencedPackages);
+			}
+		}
+		
 		GetObjectSerializer()->CollectObjectPackages(NavCollisionObjectIndex, OutReferencedPackages);
 		GetObjectSerializer()->CollectObjectPackages(BodySetupObjectIndex, OutReferencedPackages);