Merge pull request #75 from rive-app/development

Development
rive-app · Apr 3, 2024 · fbe55b1 · fbe55b1
2 parents 3d9f8bc + 289cd0d
commit fbe55b1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Rive.uplugin b/Rive.uplugin
@@ -23,7 +23,7 @@
 		},
 		{
 			"Name": "RiveRenderer",
-			"Type": "Runtime",
+			"Type": "RuntimeNoCommandlet",
 			"LoadingPhase": "Default",
 			"WhitelistPlatforms": ["Win64", "Mac", "IOS", "Android"]
 		},

diff --git a/Source/Rive/Private/Rive/RiveFile.cpp b/Source/Rive/Private/Rive/RiveFile.cpp
@@ -96,7 +96,7 @@ void URiveFile::PostLoad()
 			{
 				AssetImportData->UpdateFilenameOnly(RiveFilePath);
 			}
-			else if (!ensure(FPaths::IsSamePath(FullPath, RiveFilePath)))
+			else if (!FPaths::IsSamePath(FullPath, RiveFilePath))
 			{
 				UE_LOG(LogRive, Warning, TEXT("The path of RiveFile '%s' is not matching the AssetImportData, resetting to RiveFilePath. RiveFilePath: '%s'  AssetImportData: '%s'"),
 					*GetFullName(), *RiveFilePath, *FullPath)

diff --git a/Source/Rive/Private/RiveWidget/RivePostProcessSceneViewExtension.cpp b/Source/Rive/Private/RiveWidget/RivePostProcessSceneViewExtension.cpp
@@ -3,8 +3,9 @@
 #include "RivePostProcessSceneViewExtension.h"
 
 #include "Engine/TextureRenderTarget2D.h"
-#include "ScreenPass.h"
 #include "PostProcess/PostProcessMaterialInputs.h"
+#include "Runtime/Launch/Resources/Version.h"
+#include "ScreenPass.h"
 #include "TextureResource.h"
 
 FRivePostProcessSceneViewExtension::FRivePostProcessSceneViewExtension(const FAutoRegister& AutoRegister, UTextureRenderTarget2D& WidgetRenderTarget)