From 694ef0d1e7217c3119faceebeb0cb466f283aa1b Mon Sep 17 00:00:00 2001 From: Daniel Butum Date: Tue, 24 Oct 2017 20:59:34 +0300 Subject: [PATCH] Fix compile for 4.17 --- ObjectBrowser.uplugin | 3 +-- README.md | 2 +- Source/Private/ObjectBrowser.h | 1 - Source/Private/ObjectBrowserModule.cpp | 2 +- Source/Private/ObjectBrowserModule.h | 2 +- Source/Private/Widgets/SObjectBrowser.cpp | 6 +++--- Source/Private/Widgets/SObjectBrowser.h | 1 - Source/Private/Widgets/SObjectBrowserTableRow.h | 2 +- Source/Public/IObjectBrowserModule.h | 2 +- 9 files changed, 9 insertions(+), 12 deletions(-) diff --git a/ObjectBrowser.uplugin b/ObjectBrowser.uplugin index 13ef1c4..2f8500b 100644 --- a/ObjectBrowser.uplugin +++ b/ObjectBrowser.uplugin @@ -10,7 +10,6 @@ "CreatedByURL": "http://epicgames.com", "DocsURL": "https://github.com/ue4plugins/ObjectBrowser", "SupportURL": "https://twitter.com/NickDarnell", - "EngineVersion": "4.16.0", "EnabledByDefault": true, "Modules": [ @@ -19,4 +18,4 @@ "Type": "Editor" } ] -} \ No newline at end of file +} diff --git a/README.md b/README.md index 5c333e6..c36180a 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ of objects in memory. Handy for debugging state and verifying things are correc ## Supported Platforms -This plug-in was last built against **Unreal Engine 4.16**. It works on all platforms. +This plug-in was last built against **Unreal Engine 4.17**. It works on all platforms. ## Dependencies diff --git a/Source/Private/ObjectBrowser.h b/Source/Private/ObjectBrowser.h index 776b47e..bc23828 100644 --- a/Source/Private/ObjectBrowser.h +++ b/Source/Private/ObjectBrowser.h @@ -3,7 +3,6 @@ #pragma once - /* Dependencies *****************************************************************************/ diff --git a/Source/Private/ObjectBrowserModule.cpp b/Source/Private/ObjectBrowserModule.cpp index ab7b93c..3233bcd 100644 --- a/Source/Private/ObjectBrowserModule.cpp +++ b/Source/Private/ObjectBrowserModule.cpp @@ -1,5 +1,5 @@ // Copyright 1998-2017 Epic Games, Inc. All Rights Reserved. - +#include "ObjectBrowserPrivatePCH.h" #include "ObjectBrowserModule.h" #include "Widgets/SObjectBrowser.h" #include "Widgets/DeclarativeSyntaxSupport.h" diff --git a/Source/Private/ObjectBrowserModule.h b/Source/Private/ObjectBrowserModule.h index 909e7b7..51ff31a 100644 --- a/Source/Private/ObjectBrowserModule.h +++ b/Source/Private/ObjectBrowserModule.h @@ -29,4 +29,4 @@ class FObjectBrowserModule : public IObjectBrowserModule private: // Handles creating the project settings tab. TSharedRef HandleSpawnSettingsTab(const FSpawnTabArgs& SpawnTabArgs); -}; \ No newline at end of file +}; diff --git a/Source/Private/Widgets/SObjectBrowser.cpp b/Source/Private/Widgets/SObjectBrowser.cpp index b1a7e68..efcd2bc 100644 --- a/Source/Private/Widgets/SObjectBrowser.cpp +++ b/Source/Private/Widgets/SObjectBrowser.cpp @@ -1,5 +1,5 @@ // Copyright 1998-2017 Epic Games, Inc. All Rights Reserved. - +#include "ObjectBrowserPrivatePCH.h" #include "SObjectBrowser.h" #include "SObjectBrowserTableRow.h" #include "PropertyEditorModule.h" @@ -317,7 +317,7 @@ FText SObjectBrowser::GetFilterClassText() const FReply SObjectBrowser::OnClassSelectionClicked() { const FText TitleText = LOCTEXT("PickClass", "Pick Class"); - + FClassViewerInitializationOptions Options; Options.Mode = EClassViewerMode::ClassPicker; @@ -356,7 +356,7 @@ void SObjectBrowser::HandleListSelectionChanged(TSharedPtr InIte TArray< TWeakObjectPtr > Selection; Selection.Add(InItem->Object); - + PropertyView->SetObjects(Selection); } diff --git a/Source/Private/Widgets/SObjectBrowser.h b/Source/Private/Widgets/SObjectBrowser.h index 4f9b860..b678613 100644 --- a/Source/Private/Widgets/SObjectBrowser.h +++ b/Source/Private/Widgets/SObjectBrowser.h @@ -1,7 +1,6 @@ // Copyright 1998-2017 Epic Games, Inc. All Rights Reserved. #pragma once - #include "Widgets/SCompoundWidget.h" struct FBrowserObject diff --git a/Source/Private/Widgets/SObjectBrowserTableRow.h b/Source/Private/Widgets/SObjectBrowserTableRow.h index 41ebcd0..9110bfe 100644 --- a/Source/Private/Widgets/SObjectBrowserTableRow.h +++ b/Source/Private/Widgets/SObjectBrowserTableRow.h @@ -1,7 +1,7 @@ // Copyright 1998-2017 Epic Games, Inc. All Rights Reserved. #pragma once - +#include "ObjectBrowserPrivatePCH.h" #include "ClassIconFinder.h" #include "Toolkits/AssetEditorManager.h" #include "CoreMinimal.h" diff --git a/Source/Public/IObjectBrowserModule.h b/Source/Public/IObjectBrowserModule.h index 990b223..5e0feb5 100644 --- a/Source/Public/IObjectBrowserModule.h +++ b/Source/Public/IObjectBrowserModule.h @@ -1,7 +1,7 @@ // Copyright 1998-2017 Epic Games, Inc. All Rights Reserved. #pragma once - +#include "ObjectBrowserPrivatePCH.h" /** * Interface for the ObjectBrowser module.