Skip to content

Commit e434467

Browse files
author
Roberto De Ioris
committed
huge refactor to support slate in standalone builds
1 parent 1a1425f commit e434467

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+67
-232
lines changed

Source/UnrealEnginePython/Private/PythonScriptFactory.cpp renamed to Source/PythonConsole/Private/PythonScriptFactory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "UnrealEnginePythonPrivatePCH.h"
1+
#include "PythonConsolePrivatePCH.h"
22

33
#include "PythonScriptFactory.h"
44
#include "PythonScript.h"
@@ -22,4 +22,4 @@ UObject* UPythonScriptFactory::FactoryCreateFile(UClass * Class, UObject *InPare
2222

2323
bOutOperationCanceled = false;
2424
return NewAsset;
25-
}
25+
}

Source/UnrealEnginePython/Public/PythonScriptFactory.h renamed to Source/PythonConsole/Public/PythonScriptFactory.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ class UPythonScriptFactory : public UFactory
88
{
99
GENERATED_UCLASS_BODY()
1010

11+
public:
1112
virtual UObject* FactoryCreateFile(UClass * Class, UObject *InParent, FName InName, EObjectFlags Flags, const FString& Filename, const TCHAR* Parms, FFeedbackContext *Warn, bool& bOutOperationCanceled) override;
1213
};
1314

15+

‎Source/UnrealEnginePython/Private/Slate/UEPyFMenuBuilder.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "UnrealEnginePythonPrivatePCH.h"
22

3-
#if WITH_EDITOR
3+
#include "UEPyFMenuBuilder.h"
44

55
#include "Runtime/Slate/Public/Framework/Commands/UIAction.h"
66
#include "Developer/AssetTools/Public/AssetToolsModule.h"
@@ -192,5 +192,3 @@ void ue_python_init_fmenu_builder(PyObject *ue_module) {
192192
Py_INCREF(&ue_PyFMenuBuilderType);
193193
PyModule_AddObject(ue_module, "FMenuBuilder", (PyObject *)&ue_PyFMenuBuilderType);
194194
}
195-
196-
#endif

‎Source/UnrealEnginePython/Private/Slate/UEPyFMenuBuilder.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
#include "UnrealEnginePython.h"
44

5-
#if WITH_EDITOR
6-
75
#include "Runtime/Slate/Public/Framework/MultiBox/MultiBoxBuilder.h"
86

97
typedef struct {
@@ -13,5 +11,3 @@ typedef struct {
1311
} ue_PyFMenuBuilder;
1412

1513
void ue_python_init_fmenu_builder(PyObject *);
16-
17-
#endif

‎Source/UnrealEnginePython/Private/Slate/UEPyFTabSpawnerEntry.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "UnrealEnginePythonPrivatePCH.h"
22

3-
#if WITH_EDITOR
43

54
static PyObject *py_ue_ftab_spawner_entry_set_display_name(ue_PyFTabSpawnerEntry *self, PyObject * args) {
65
char *name;
@@ -86,5 +85,3 @@ PyObject *py_ue_new_ftab_spawner_entry(FTabSpawnerEntry *spawner_entry) {
8685
ret->spawner_entry = spawner_entry;
8786
return (PyObject *)ret;
8887
}
89-
90-
#endif

‎Source/UnrealEnginePython/Private/Slate/UEPyFTabSpawnerEntry.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
#include "UnrealEnginePython.h"
44

5-
#if WITH_EDITOR
6-
75
#include "Runtime/Slate/Public/Framework/Docking/TabManager.h"
86

97
typedef struct {
@@ -15,5 +13,3 @@ typedef struct {
1513
PyObject *py_ue_new_ftab_spawner_entry(FTabSpawnerEntry *);
1614

1715
void ue_python_init_ftab_spawner_entry(PyObject *);
18-
19-
#endif

‎Source/UnrealEnginePython/Private/Slate/UEPySBorder.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
#if WITH_EDITOR
21

32
#include "UnrealEnginePythonPrivatePCH.h"
43

54
#include "UEPySBorder.h"
65

76

8-
97
#define GET_s_border SBorder *s_border = (SBorder *)self->s_compound_widget.s_widget.s_widget
108

119
static PyObject *py_ue_sborder_clear_content(ue_PySBorder *self, PyObject * args) {
@@ -155,6 +153,3 @@ void ue_python_init_sborder(PyObject *ue_module) {
155153
Py_INCREF(&ue_PySBorderType);
156154
PyModule_AddObject(ue_module, "SBorder", (PyObject *)&ue_PySBorderType);
157155
}
158-
159-
160-
#endif

‎Source/UnrealEnginePython/Private/Slate/UEPySBorder.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
#include "UnrealEnginePython.h"
44

5-
#if WITH_EDITOR
6-
75
#include "UEPySCompoundWidget.h"
86

97
#include "Runtime/Slate/Public/Widgets/Layout/SBorder.h"
@@ -16,5 +14,3 @@ typedef struct {
1614
} ue_PySBorder;
1715

1816
void ue_python_init_sborder(PyObject *);
19-
20-
#endif

‎Source/UnrealEnginePython/Private/Slate/UEPySBoxPanel.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#if WITH_EDITOR
21

32
#include "UnrealEnginePythonPrivatePCH.h"
43

@@ -69,6 +68,3 @@ void ue_python_init_sbox_panel(PyObject *ue_module) {
6968
Py_INCREF(&ue_PySGridPanelType);
7069
PyModule_AddObject(ue_module, "SBoxPanel", (PyObject *)&ue_PySBoxPanelType);
7170
}
72-
73-
74-
#endif

‎Source/UnrealEnginePython/Private/Slate/UEPySBoxPanel.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
#include "UnrealEnginePython.h"
44

5-
#if WITH_EDITOR
65

76
#include "UEPySPanel.h"
87

@@ -16,5 +15,3 @@ typedef struct {
1615
} ue_PySBoxPanel;
1716

1817
void ue_python_init_sbox_panel(PyObject *);
19-
20-
#endif

0 commit comments

Comments
 (0)