Merge commit '03f3f10983057c3401ef31ebb9dff715be3ddaa9'

FicsItCam.uplugin

@@ -26,7 +26,7 @@
 	"Plugins": [
         {
             "Name": "SML",
-            "SemVersion": "^3.3.0",
+            "SemVersion": "^3.3.2",
             "Enabled": true
         }
     ]

Jenkinsfile

@@ -118,7 +118,7 @@ pipeline {
 		always {
 			cleanWs()
 			withCredentials([string(credentialsId: 'FINDiscordToken_FicsItCam', variable: 'WEBHOOKURL')]) {
-				discordSend description: "FIN Build", link: env.BUILD_URL, result: currentBuild.currentResult, title: JOB_NAME, webhookURL: "$WEBHOOKURL"
+				discordSend description: "FIC Build", link: env.BUILD_URL, result: currentBuild.currentResult, title: JOB_NAME, webhookURL: "$WEBHOOKURL"
 			}
 		}
 	}

Source/FicsItCam/Private/Data/Objects/FICParticleSystem.cpp

@@ -1,5 +1,6 @@
 #include "Data/Objects/FICParticleSystem.h"
 
+#include "FICUtils.h"
 #include "NiagaraComponent.h"
 #include "Data/Objects/FICWorldSettings.h"
 #include "Editor/FICEditorContext.h"

Source/FicsItCam/Private/Editor/FICEditorSubsystem.cpp

@@ -293,16 +293,18 @@ void AFICEditorSubsystem::CloseEditor() {
 	// Focus back to viewport
 	Character->SetControlView(true);
 
+	// Remove Editor UI
+	GameOverlay->RemoveSlot(EditorWidget.ToSharedRef());
+
 	// Unload loaded Editor Context
 	Context->Unload();
 
 	// Swap PlayerCharacter to FG Player Character 
 	GetWorld()->GetFirstPlayerController()->Possess(OriginalPlayerCharacter);
 	UFGInputLibrary::UpdateInputMappings(GetWorld()->GetFirstPlayerController());
 	UFGGameUserSettings::GetFGGameUserSettings()->ApplySettings(false);
-
-	// Remove Editor UI
-	GameOverlay->RemoveSlot(EditorWidget.ToSharedRef());
+
+	// Add Game Viewport Back
 	GameOverlay->AddSlot()[
 		GameViewportContainer.ToSharedRef()
 	];
@@ -332,10 +334,10 @@ void AFICEditorSubsystem::SetMeshInstanced(UMeshComponent* MeshComp, bool Instan
 			ColoredMeshProxy->mBlockInstancing = !Instanced;
 			ColoredMeshProxy->SetInstanced(Instanced);
 		} else {
-			auto ProdIndInst = Cast<UFGProductionIndicatorInstanceComponent>(MeshComp);
+			/*auto ProdIndInst = Cast<UFGProductionIndicatorInstanceComponent>(MeshComp);
 			if (ProdIndInst) {
 				ProdIndInst->SetInstanced(Instanced);
-			}
+			}*/
 		}
 	}
 }

Source/FicsItCam/Private/Editor/UI/FICViewport.cpp

@@ -27,7 +27,7 @@ void SFICViewport::OnDragEnter(const FGeometry& MyGeometry, const FDragDropEvent
 	if (SceneObjectDrag) {
 		if (!SceneObjectDrag->SceneObject && SceneObjectDrag->bSceneObjectTemp) {
 			UObject* CDO = SceneObjectDrag->SceneObjectClass->GetDefaultObject();
-			UObject* SceneObject = Cast<IFICSceneObject>(CDO)->CreateNewObject(AFICSubsystem::GetFICSubsystem(Context), Context->GetScene());
+			UObject* SceneObject = Cast<IFICSceneObject>(CDO)->CreateNewObject(Context->GetScene(), Context->GetScene());
 			Context->AddSceneObject(SceneObject);
 			SceneObjectDrag->SceneObject = SceneObject;
 			SceneObjectDrag->Context = Context;

Source/FicsItCam/Private/Runtime/FICCaptureCamera.cpp

@@ -31,9 +31,9 @@ void AFICCaptureCamera::SetCamera(bool bEnabled, bool bCinematic) {
 	}
 	if (bEnabled) {
 		if (bCinematic) {
-			Camera = NewObject<UCineCameraComponent>();
+			Camera = NewObject<UCineCameraComponent>(this);
 		} else {
-			Camera = NewObject<UCameraComponent>();
+			Camera = NewObject<UCameraComponent>(this);
 		}
 		Camera->AttachToComponent(RootComponent, FAttachmentTransformRules::KeepRelativeTransform);
 		Camera->PostProcessSettings.VignetteIntensity = 0;

Source/FicsItCam/Private/Runtime/FICTimelapseCamera.cpp

@@ -32,7 +32,7 @@ void AFICTimelapseCamera::OnConstruction(const FTransform& Transform) {
 void AFICTimelapseCamera::BeginPlay() {
 	Super::BeginPlay();
 
-	UFICRuntimeProcessTimelapseCamera* Process = NewObject<UFICRuntimeProcessTimelapseCamera>(GetWorld());
+	UFICRuntimeProcessTimelapseCamera* Process = NewObject<UFICRuntimeProcessTimelapseCamera>(AFICSubsystem::GetFICSubsystem(this));
 	Process->CameraArgument.CameraSettingsSnapshot = UFICUtils::CreateCameraSettingsSnapshotFromView(this);
 	Process->CameraArgument.CameraSettingsSnapshot.Location = GetActorLocation();
 	Process->CameraArgument.CameraSettingsSnapshot.Rotation = GetActorRotation();

Source/FicsItCam/Public/Command/Scene/FICCommandCreate.h

@@ -32,7 +32,7 @@ class UFICCommandCreate : public UFICCommand {
 		Scene->ResolutionHeight = Resolution.Y;
 		Scene->SceneName = InArgs[0];
 		UFICCamera* CDO = UFICCamera::StaticClass()->GetDefaultObject<UFICCamera>();
-		if (CDO) Scene->AddSceneObject(CDO->CreateNewObject(AFICEditorSubsystem::GetFICEditorSubsystem(InSender), Scene));
+		if (CDO) Scene->AddSceneObject(CDO->CreateNewObject(AFICSubsystem::GetFICSubsystem(InSender), Scene));
 
 		InSender->SendChatMessage(FString::Printf(TEXT("Scene '%s' created."), *InArgs[0]));
 		return EExecutionStatus::COMPLETED;