Merge branch 'master' into 4.21

Author: coderespawn

CHANGELOG.txt

@@ -3,6 +3,7 @@ CHANGELOG: Prefabricator
 
 Version 1.0.4
 -------------
+* Fixed a mobility bug with prefabs
 * Added whitelist platforms to the plugin descriptor as per the marketplace requirements
 * Added categories to all blueprint UFUNCTIONs so it doesn't cause compile errors on engine source builds
 * Added authors page

Prefabricator.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion" : 3,
 	"FriendlyName" : "Prefabricator",
-	"Version" : 5,
+	"Version" : 6,
 	"VersionName" : "1.0.4",
 	"CreatedBy" : "Code Respawn",
 	"CreatedByURL" : "http://prefabricator.io",

Source/PrefabricatorRuntime/Private/Asset/PrefabricatorAsset.cpp

@@ -40,22 +40,24 @@ FVector FPrefabricatorAssetUtils::FindPivot(const TArray<AActor*>& InActors)
 
 EComponentMobility::Type FPrefabricatorAssetUtils::FindMobility(const TArray<AActor*>& InActors)
 {
-	EComponentMobility::Type Mobility = EComponentMobility::Static;
-
+	return EComponentMobility::Static;
+	/*
+	EComponentMobility::Type Mobility = EComponentMobility::Movable;
 	for (AActor* Actor : InActors) {
 		if (!Actor || !Actor->GetRootComponent()) {
 			continue;
 		}
 		EComponentMobility::Type ActorMobility = Actor->GetRootComponent()->Mobility;
-		if (Mobility == EComponentMobility::Static && ActorMobility != EComponentMobility::Static) {
-			Mobility = ActorMobility;
+		if (Mobility == EComponentMobility::Movable && ActorMobility == EComponentMobility::Stationary) {
+			Mobility = EComponentMobility::Stationary;
 		}
-		if (Mobility == EComponentMobility::Stationary && ActorMobility == EComponentMobility::Movable) {
-			Mobility = EComponentMobility::Movable;
+		else if (ActorMobility == EComponentMobility::Static) {
+			Mobility = EComponentMobility::Static;
 		}
 	}
 
 	return Mobility;
+	*/
 }
 
 UPrefabricatorAsset* UPrefabricatorAssetCollection::GetPrefabAsset(const FPrefabAssetSelectionConfig& InConfig)

Source/PrefabricatorRuntime/Private/Prefab/PrefabTools.cpp

@@ -164,9 +164,6 @@ void FPrefabTools::CreatePrefabFromActors(const TArray<AActor*>& InActors)
 	PrefabActor->PrefabComponent->PrefabAssetInterface = PrefabAsset;
 	// Attach the actors to the prefab
 	for (AActor* Actor : Actors) {
-		if (Actor->GetRootComponent()) {
-			Actor->GetRootComponent()->SetMobility(Mobility);
-		}
 		ParentActors(PrefabActor, Actor);
 	}
 
@@ -339,9 +336,10 @@ namespace {
 				continue;
 			}
 
+			bool bForceSerialize = FPrefabTools::ShouldForcePropertySerialization(Property->GetFName());
+
 			// Check if it has the default value
-			FString PropertyName = Property->GetName();
-			if (HasDefaultValue(ObjToSerialize, PropertyName)) {
+			if (!bForceSerialize && HasDefaultValue(ObjToSerialize, Property->GetName())) {
 				continue;
 			}
 
@@ -357,6 +355,7 @@ namespace {
 			UPrefabricatorProperty* PrefabProperty = nullptr;
 			FString PropertyName = Property->GetName();
 
+			
 			if (ShouldSkipSerialization(Property, ObjToSerialize, PrefabActor)) {
 				continue;
 			}
@@ -419,6 +418,15 @@ bool FPrefabTools::ShouldIgnorePropertySerialization(const FName& InPropertyName
 	return IgnoredFields.Contains(InPropertyName);
 }
 
+bool FPrefabTools::ShouldForcePropertySerialization(const FName& PropertyName)
+{
+	static const TSet<FName> FieldsToForceSerialize = {
+		"Mobility"
+	};
+
+	return FieldsToForceSerialize.Contains(PropertyName);
+}
+
 void FPrefabTools::SaveStateToPrefabAsset(AActor* InActor, APrefabActor* PrefabActor, FPrefabricatorActorData& OutActorData)
 {
 	if (!InActor) return;

Source/PrefabricatorRuntime/Public/Prefab/PrefabTools.h

@@ -32,6 +32,7 @@ class PREFABRICATORRUNTIME_API FPrefabTools {
 
 	static FBox GetPrefabBounds(AActor* PrefabActor);
 	static bool ShouldIgnorePropertySerialization(const FName& PropertyName);
+	static bool ShouldForcePropertySerialization(const FName& PropertyName);
 
 	static void ParentActors(AActor* ParentActor, AActor* ChildActor);
 	static void SelectPrefabActor(AActor* PrefabActor);