From 24f6c5fef1508446968c1544836bb666d8e4837b Mon Sep 17 00:00:00 2001 From: getnamo Date: Tue, 14 Nov 2017 06:14:17 +0000 Subject: [PATCH] 4.18 compile fixes --- BLUI.uplugin | 2 +- Source/Blu/Private/Blu.cpp | 4 ++-- Source/Blu/Private/BluBluprintFunctionLibrary.cpp | 2 +- Source/Blu/Private/BluEye.cpp | 2 +- Source/BluLoader/Private/BluLoader.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/BLUI.uplugin b/BLUI.uplugin index d94d86b..22b3130 100644 --- a/BLUI.uplugin +++ b/BLUI.uplugin @@ -2,7 +2,7 @@ "FileVersion": 3, "FriendlyName": "BLUI", "Version": 3, - "VersionName": "3.2.2", + "VersionName": "3.2.3", "Description": "Chromium Embedded Framework (CEF) powered HTML UI and HUD for Unreal Engine 4", "Category": "UI", "CreatedBy": "Aaron M. Shea", diff --git a/Source/Blu/Private/Blu.cpp b/Source/Blu/Private/Blu.cpp index b6cc8db..17d8839 100644 --- a/Source/Blu/Private/Blu.cpp +++ b/Source/Blu/Private/Blu.cpp @@ -6,8 +6,8 @@ class FBlu : public IBlu /** IModuleInterface implementation */ virtual void StartupModule() override { - CefString GameDirCef = *FPaths::ConvertRelativePathToFull(FPaths::GameDir() + "BluCache"); - FString ExecutablePath = FPaths::ConvertRelativePathToFull(FPaths::GameDir() + "Plugins/BLUI/ThirdParty/cef/"); + CefString GameDirCef = *FPaths::ConvertRelativePathToFull(FPaths::ProjectDir() + "BluCache"); + FString ExecutablePath = FPaths::ConvertRelativePathToFull(FPaths::ProjectDir() + "Plugins/BLUI/ThirdParty/cef/"); // Setup the default settings for BluManager BluManager::settings.windowless_rendering_enabled = true; diff --git a/Source/Blu/Private/BluBluprintFunctionLibrary.cpp b/Source/Blu/Private/BluBluprintFunctionLibrary.cpp index 53b60a7..7b9a433 100644 --- a/Source/Blu/Private/BluBluprintFunctionLibrary.cpp +++ b/Source/Blu/Private/BluBluprintFunctionLibrary.cpp @@ -60,7 +60,7 @@ FString UBluBlueprintFunctionLibrary::JSONToString(UBluJsonObj *ObjectToParse) FString UBluBlueprintFunctionLibrary::GameRootDirectory() { - return FPaths::ConvertRelativePathToFull(FPaths::GameDir()); + return FPaths::ConvertRelativePathToFull(FPaths::ProjectDir()); } diff --git a/Source/Blu/Private/BluEye.cpp b/Source/Blu/Private/BluEye.cpp index ff312bd..8085120 100644 --- a/Source/Blu/Private/BluEye.cpp +++ b/Source/Blu/Private/BluEye.cpp @@ -198,7 +198,7 @@ void UBluEye::LoadURL(const FString& newURL) { // Get the current working directory - FString GameDir = FPaths::ConvertRelativePathToFull(FPaths::GameDir()); + FString GameDir = FPaths::ConvertRelativePathToFull(FPaths::ProjectDir()); // We're loading a local file, so replace the proto with our game directory path FString LocalFile = newURL.Replace(TEXT("blui://"), *GameDir, ESearchCase::IgnoreCase); diff --git a/Source/BluLoader/Private/BluLoader.cpp b/Source/BluLoader/Private/BluLoader.cpp index 6833bbb..d4850d0 100644 --- a/Source/BluLoader/Private/BluLoader.cpp +++ b/Source/BluLoader/Private/BluLoader.cpp @@ -7,7 +7,7 @@ class FBluLoader : public IBluLoader /** IModuleInterface implementation */ virtual void StartupModule() override { - FString LibPath = FPaths::ConvertRelativePathToFull(FPaths::GameDir() + "Plugins/BLUI/ThirdParty/cef/"); + FString LibPath = FPaths::ConvertRelativePathToFull(FPaths::ProjectDir() + "Plugins/BLUI/ThirdParty/cef/"); // If we're on Windows we need to load DLLs from our custom path #if PLATFORM_WINDOWS