20tab · syedalamabbas · Jul 22, 2018 · Jul 22, 2018 · Jul 23, 2018 · Jul 23, 2018
diff --git a/.gitignore b/.gitignore
@@ -89,6 +89,7 @@ ENV/
 .ropeproject
 
 Binaries/
+Intermediate/
 python35/
 python27/
 *.un~
diff --git a/README.md b/README.md
@@ -10,6 +10,16 @@ Funny snippets for working with StaticMesh and SkeletalMesh assets: https://gith
 
 More tutorials: https://github.com/20tab/UnrealEnginePython/tree/master/tutorials
 
+# Project Status (IMPORTANT)
+
+Currently (as april 2020) the project is on hold: between 2016 and 2018 20tab invested lot of resources in it but unfortunately epic (during 2018) decided to suddenly release its own implementation and the request made for a megagrant in 2019 by the original plugin author was rejected too.
+
+As this plugin (still) has way more features than the Epic one and many contributors, **we are currently looking for new maintainers** helping us to keep it alive, checking PR and issues. If you are interested in working on it a few hours a week, drop us a line at info@20tab.com to discuss about it.
+
+If you are interested in game logic scripting/modding in Unreal Engine 4 consider giving a look at the LuaMachine project (https://github.com/rdeioris/LuaMachine/).
+
+The plugin should work up to unreal engine version 4.23 and there are forks/pull requests for 4.24. Since 4.25 Epic refactored the UProperty subsystem, so if you want to port the plugin to a version >= 4.25 you should make a lot of search & replace (basically renaming UProperty to FProperty and Cast to CastField should be enough)
+
 # How and Why ?
 
 This is a plugin embedding a whole Python VM (versions 3.x [the default and suggested one] and 2.7) In Unreal Engine 4 (both the editor and runtime).
@@ -30,11 +40,11 @@ Once the plugin is installed and enabled, you get access to the 'PythonConsole'
 
 All of the exposed engine features are under the 'unreal_engine' virtual module (it is completely coded in c into the plugin, so do not expect to run 'import unreal_engine' from a standard python shell)
 
-The currently supported Unreal Engine versions are 4.12, 4.13, 4.14, 4.15, 4.16, 4.17, 4.18 and 4.19
+The minimal supported Unreal Engine version is 4.12, while the latest is 4.23
 
 We support official python.org releases as well as IntelPython and Anaconda distributions.
 
-Note: this plugin has nothing to do with the experimental 'PythonScriptPlugin' included in Unreal Engine >= 4.19. We aim at full integration with engine and editor (included the Slate api), as well as support for the vast majority of python features like asyncio, coroutines, generators, threads and third party modules.
+Note: this plugin has nothing to do with the experimental 'PythonScriptPlugin' included in Unreal Engine >= 4.19. We aim at full integration with engine and editor (included the Slate api, check here: https://github.com/20tab/UnrealEnginePython/blob/master/docs/Slate_API.md), as well as support for the vast majority of python features like asyncio, coroutines, generators, threads and third party modules.
 
 # Binary installation on Windows (64 bit)
 
@@ -165,9 +175,14 @@ Just remove the .so files in Plugins/UnrealEnginePython/Binaries/Linux and pull
 
 At the next run the build procedure wil be started again.
 
+Android Deployment
+------------------
+
+Check https://github.com/20tab/UnrealEnginePython/blob/master/docs/Android.md
+
 # Installation on other platforms
 
-Currently only Windows, MacOSX and Linux are supported. We are investigating Android support too via the kivy project.
+Currently only Windows, MacOSX, Linux and Android are supported.
 
 # Using Python with Unreal Engine (finally)
 
@@ -426,6 +441,27 @@ vec = self.uobject.GetActorLocation()
 
 Reflection based functions are those in camelcase (or with the first capital letter). Native functions instead follow the python style, with lower case, underscore-as-separator function names.
 
+Note that, in editor builds, when you change the property of an archetype (included ClassDefaultObject) via __setattr__ all of the archtype instances will be updated too.
+
+To be more clear:
+
+```python
+your_blueprint.GeneratedClass.get_cdo().CharacterMovement.MaxWalkSpeed = 600.0
+```
+
+is a super shortcut for:
+
+```python
+your_blueprint.GeneratedClass.get_cdo().CharacterMovement.pre_edit_change('MaxWalkSpeed')
+your_blueprint.GeneratedClass.get_cdo().CharacterMovement.set_property('MaxWalkSpeed', 600.0)
+your_blueprint.GeneratedClass.get_cdo().CharacterMovement.post_edit_change_property('MaxWalkSpeed')
+for instance in your_blueprint.GeneratedClass.get_cdo().CharacterMovement.get_archetype_instances():
+    instance.pre_edit_change('MaxWalkSpeed')
+    instance.set_property('MaxWalkSpeed', 600.0)
+    instance.post_edit_change_property('MaxWalkSpeed')
+```
+
+
 The automagic UClass, UStruct and UEnums mappers
 ------------------------------------------------
 
@@ -473,8 +509,6 @@ if is_hitting_something:
     ue.log(hit_result)
 ```
 
-Remember that structs are passed by value (not by ref like UObject's), so a dedicated unreal_engine.UScriptStruct python class is exposed.
-
 To create a new struct instance you can do:
 
 ```python
@@ -495,29 +529,6 @@ To access the fields of a struct just call the fields() method.
 
 A good example of struct usage is available here: https://github.com/20tab/UnrealEnginePython/blob/master/docs/Settings.md
 
-As structs are passed by value, you need to pay attention when manipulating structs fields that are structs by themselves:
-
-```python
-from unreal_engine.structs import TerrificStruct, DumbStruct
-
-ts = TerrificStruct()
-ts.dumb = DumbStruct(Foo=17, Bar=22)
-
-# will not modify the original DumbStruct but a copy of it !!!
-ts.dumb.Foo = 22
-```
-
-You can eventually force structs to be passed by ref (extremely dangerous as the internal C pointer could be a dangling one) using the ref() function:
-
-```python
-from unreal_engine.structs import TerrificStruct, DumbStruct
-
-ts = TerrificStruct()
-ts.dumb = DumbStruct(Foo=17, Bar=22)
-
-# ref() will return a pointer to a struct
-ts.ref().dumb.foo().Foo = 22
-```
 
 More details here: https://github.com/20tab/UnrealEnginePython/blob/master/docs/MemoryManagement.md
 
@@ -685,6 +696,7 @@ The following parameters are supported:
 * `RelativeAdditionalModulesPath`: like AdditionalModulesPath, but the path is relative to the /Content directory
 * `ZipPath`: allow to specify a .zip file that is added to sys.path
 * `RelativeZipPath`: like ZipPath, but the path is relative to the /Content directory
+* `ImportModules: comma/space/semicolon separated list of modules to import on startup (after ue_site)
 
 Example:
 
@@ -906,7 +918,7 @@ Sometimes you may have a UObject and know that it is backed by a python object.
 
 This would be resolved as shown below:
 
-```
+```python
 import unreal_engine as ue
 
 class Explosive:
@@ -941,9 +953,9 @@ We try to do our best to "protect" the user, but you can effectively crash UE fr
 Contacts and Commercial Support
 -------------------------------
 
-If you want to contact us (for help, support, sponsorship), drop a mail to info at 20tab.com or follow @unbit on twitter
+If you need commercial support for UnrealEnginePython just drop a mail to info at 20tab.com
 
-We offer commercial support for both UnrealEngine and UnrealEnginePython, again drop a mail to info at 20tab.com for more infos
+Follow @unbit on twitter for news about the project
 
 Special Thanks
 --------------
@@ -954,3 +966,4 @@ Such a big project requires constant sponsorship, special thanks go to:
 
 * GoodTH.INC https://www.goodthinc.com/ (they are sponsoring the sequencer api)
 
+* Quixel AB https://megascans.se/ (built their integration tool over UnrealEnginePython giving us tons of useful feedbacks and ideas)
diff --git a/Source/PythonAutomation/Public/PythonAutomationModule.h b/Source/PythonAutomation/Public/PythonAutomationModule.h
@@ -3,7 +3,11 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#if ENGINE_MAJOR_VERSION==4 && ENGINE_MINOR_VERSION>=22
+#include "Modules/ModuleInterface.h"
+#else
 #include "ModuleInterface.h"
+#endif
 
 class FPythonAutomationModule : public IModuleInterface
 {

diff --git a/Source/PythonConsole/Private/PyFbxFactory.cpp b/Source/PythonConsole/Private/PyFbxFactory.cpp
@@ -1,6 +1,7 @@
 
 #include "PyFbxFactory.h"
 #include "FbxMeshUtils.h"
+#include "Runtime/Launch/Resources/Version.h"
 
 UPyFbxFactory::UPyFbxFactory(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
@@ -23,6 +24,23 @@ void UPyFbxFactory::PostInitProperties() {
 	ImportUI->MeshTypeToImport = FBXIT_MAX;
 }
 
+UObject * UPyFbxFactory::FactoryCreateFile(UClass* InClass, UObject* InParent, FName InName, EObjectFlags Flags, const FString& Filename, const TCHAR* Parms, FFeedbackContext* Warn, bool& bOutOperationCanceled)
+{
+#if ENGINE_MINOR_VERSION >= 20
+	if (ImportUI->MeshTypeToImport == FBXIT_MAX)
+	{
+		if (!DetectImportType(UFactory::CurrentFilename))
+		{
+			return nullptr;
+		}
+	}
+	FbxMeshUtils::SetImportOption(ImportUI);
+	// ensure auto-detect is skipped
+	bDetectImportTypeOnImport = false;
+#endif
+	return Super::FactoryCreateFile(InClass, InParent, InName, Flags, Filename, Parms, Warn, bOutOperationCanceled);
+}
+
 UObject *UPyFbxFactory::FactoryCreateBinary
 (
 	UClass * InClass,

diff --git a/Source/PythonConsole/Private/PythonConsoleModule.cpp b/Source/PythonConsole/Private/PythonConsoleModule.cpp
@@ -4,7 +4,7 @@
 #include "SPythonConsole.h"
 #include "SPythonLog.h"
 #include "Editor/WorkspaceMenuStructure/Public/WorkspaceMenuStructureModule.h"
-#include "SDockTab.h"
+#include "Runtime/Slate/Public/Widgets/Docking/SDockTab.h"
 #include "Editor/WorkspaceMenuStructure/Public/WorkspaceMenuStructure.h"
 
 IMPLEMENT_MODULE( FPythonConsoleModule, PythonConsole );

diff --git a/Source/PythonConsole/Private/SPythonConsole.h b/Source/PythonConsole/Private/SPythonConsole.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "SlateCore.h"
+#include "Runtime/SlateCore/Public/SlateCore.h"
 #include "EditorStyle.h"
 #include "PythonConsoleModule.h"
 

diff --git a/Source/PythonConsole/Private/SPythonLog.cpp b/Source/PythonConsole/Private/SPythonLog.cpp
@@ -1,11 +1,11 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
 #include "SPythonLog.h"
-#include "SScrollBorder.h"
+#include "Runtime/Slate/Public/Widgets/Layout/SScrollBorder.h"
 #include "GameFramework/GameMode.h"
 #include "Engine/LocalPlayer.h"
 #include "GameFramework/GameState.h"
-#include "SSearchBox.h"
+#include "Runtime/Slate/Public/Widgets/Input/SSearchBox.h"
 #include "Runtime/Launch/Resources/Version.h"
 #include "Runtime/Slate/Public/Framework/Text/SlateTextLayout.h"
 #include "Editor/EditorStyle/Public/Classes/EditorStyleSettings.h"

diff --git a/Source/PythonConsole/Private/SPythonLog.h b/Source/PythonConsole/Private/SPythonLog.h
@@ -1,9 +1,9 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
 #pragma once
-#include "BaseTextLayoutMarshaller.h"
-#include "TextFilterExpressionEvaluator.h"
-#include "SlateCore.h"
+#include "Runtime/Slate/Public/Framework/Text/BaseTextLayoutMarshaller.h"
+#include "Runtime/Core/Public/Misc/TextFilterExpressionEvaluator.h"
+#include "Runtime/SlateCore/Public/SlateCore.h"
 #include "UnrealEnginePython.h"
 #include "Runtime/Slate/Public/Widgets/Input/SMultiLineEditableTextBox.h"
 #include "Runtime/Slate/Public/Widgets/Input/SEditableTextBox.h"

diff --git a/Source/PythonConsole/Public/PyFbxFactory.h b/Source/PythonConsole/Public/PyFbxFactory.h
@@ -15,6 +15,7 @@ class UPyFbxFactory : public UFbxFactory
 
 	virtual bool ConfigureProperties() override;
 	virtual void PostInitProperties() override;
+	virtual UObject * FactoryCreateFile(UClass* InClass, UObject* InParent, FName InName, EObjectFlags Flags, const FString& Filename, const TCHAR* Parms, FFeedbackContext* Warn, bool& bOutOperationCanceled) override;
 	virtual UObject * FactoryCreateBinary
 		(
 			UClass * InClass,

diff --git a/Source/PythonConsole/Public/PythonConsoleModule.h b/Source/PythonConsole/Public/PythonConsoleModule.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "SlateBasics.h"
+#include "Runtime/Slate/Public/SlateBasics.h"
 
 /** Style of the debug console */
 namespace EPythonConsoleStyle

diff --git a/Source/PythonEditor/Private/PYRichTextSyntaxHighlighterTextLayoutMarshaller.h b/Source/PythonEditor/Private/PYRichTextSyntaxHighlighterTextLayoutMarshaller.h
@@ -3,8 +3,8 @@
 
 #include "Runtime/SlateCore/Public/Styling/SlateTypes.h"
 #include "PythonSyntaxTokenizer.h"
-#include "PlainTextLayoutMarshaller.h"
-#include "ITextDecorator.h"
+#include "Runtime/Slate/Public/Framework/Text/PlainTextLayoutMarshaller.h"
+#include "Runtime/Slate/Public/Framework/Text/ITextDecorator.h"
 #include "PythonEditorStyle.h"
 
 

diff --git a/Source/PythonEditor/Private/PythonEditor.cpp b/Source/PythonEditor/Private/PythonEditor.cpp
@@ -1,8 +1,8 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
-#include "ModuleManager.h"
+#include "Runtime/Core/Public/Modules/ModuleManager.h"
 #include "AssetToolsModule.h"
-#include "AssetEditorToolkit.h"
+#include "Editor/UnrealEd/Public/Toolkits/AssetEditorToolkit.h"
 #include "LevelEditor.h"
 #include "PythonEditorStyle.h"
 #include "PythonProjectEditor.h"

diff --git a/Source/PythonEditor/Private/PythonEditorStyle.h b/Source/PythonEditor/Private/PythonEditorStyle.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "SlateStyle.h"
+#include "Runtime/SlateCore/Public/Styling/SlateStyle.h"
 
 class FPythonEditorStyle
 {

diff --git a/Source/PythonEditor/Private/PythonProjectEditor.cpp b/Source/PythonEditor/Private/PythonProjectEditor.cpp
@@ -3,7 +3,7 @@
 #include "PythonProjectEditor.h"
 #include "SPythonEditor.h"
 #include "SPythonProjectEditor.h"
-#include "SDockTab.h"
+#include "Runtime/Slate/Public/Widgets/Docking/SDockTab.h"
 #include "PythonProjectEditorToolbar.h"
 #include "Editor/Kismet/Public/WorkflowOrientedApp/WorkflowUObjectDocuments.h"
 #include "Editor/Kismet/Public/WorkflowOrientedApp/ApplicationMode.h"

diff --git a/Source/PythonEditor/Private/PythonProjectEditor.h b/Source/PythonEditor/Private/PythonProjectEditor.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "WorkflowCentricApplication.h"
+#include "Editor/Kismet/Public/WorkflowOrientedApp/WorkflowCentricApplication.h"
 #include "Editor/Kismet/Public/WorkflowOrientedApp/WorkflowTabManager.h"
 #include "Runtime/Launch/Resources/Version.h"
 

diff --git a/Source/PythonEditor/Private/PythonProjectEditorCommands.h b/Source/PythonEditor/Private/PythonProjectEditorCommands.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "Commands.h"
+#include "Runtime/Slate/Public/Framework/Commands/Commands.h"
 
 class FPythonProjectEditorCommands : public TCommands<FPythonProjectEditorCommands>
 {

diff --git a/Source/PythonEditor/Private/PythonSyntaxTokenizer.cpp b/Source/PythonEditor/Private/PythonSyntaxTokenizer.cpp
@@ -1,7 +1,7 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
 #include "PythonSyntaxTokenizer.h"
-#include "BreakIterator.h"
+#include "Runtime/Core/Public/Internationalization/BreakIterator.h"
 
 TSharedRef< FPythonSyntaxTokenizer > FPythonSyntaxTokenizer::Create(TArray<FRule> InRules)
 {

diff --git a/Source/PythonEditor/Private/SProjectViewItem.cpp b/Source/PythonEditor/Private/SProjectViewItem.cpp
@@ -1,8 +1,8 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
 #include "SProjectViewItem.h"
-#include "SInlineEditableTextBlock.h"
-#include "BreakIterator.h"
+#include "Runtime/Slate/Public/Widgets/Text/SInlineEditableTextBlock.h"
+#include "Runtime/Core/Public/Internationalization/BreakIterator.h"
 #include "PythonEditorStyle.h"
 
 #define LOCTEXT_NAMESPACE "ProjectViewItem"

diff --git a/Source/PythonEditor/Private/SPythonEditableText.cpp b/Source/PythonEditor/Private/SPythonEditableText.cpp
@@ -34,11 +34,10 @@ FReply SPythonEditableText::OnKeyChar(const FGeometry& MyGeometry, const FCharac
 		return Reply;
 	}
 	Reply = FReply::Handled();
+	// substitute tab, with 4 spaces
 	if (Character == TEXT('\t'))
 	{
-		FString String;
-		String.AppendChar(Character);
-		InsertTextAtCursor(String);
+		InsertTextAtCursor(FString("    "));
 	}
 	//else if (Character == TEXT('('))
 	//{

diff --git a/Source/PythonEditor/Private/SPythonEditableText.h b/Source/PythonEditor/Private/SPythonEditableText.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "SMultiLineEditableText.h"
+#include "Runtime/Slate/Public/Widgets/Text/SMultiLineEditableText.h"
 
 class SPythonEditableText : public SMultiLineEditableText
 {

diff --git a/Source/PythonEditor/Private/SPythonEditor.cpp b/Source/PythonEditor/Private/SPythonEditor.cpp
@@ -1,7 +1,7 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
 #include "SPythonEditor.h"
-#include "SMultiLineEditableText.h"
+#include "Runtime/Slate/Public/Widgets/Text/SMultiLineEditableText.h"
 #include "PYRichTextSyntaxHighlighterTextLayoutMarshaller.h"
 #include "SPythonEditableText.h"
 #include "Runtime/Core/Public/Misc/FileHelper.h"

diff --git a/Source/PythonEditor/Private/SPythonProjectEditor.cpp b/Source/PythonEditor/Private/SPythonProjectEditor.cpp
@@ -3,7 +3,7 @@
 #include "SPythonProjectEditor.h"
 #include "SProjectViewItem.h"
 #include "DirectoryScanner.h"
-#include "SThrobber.h"
+#include "Runtime/Slate/Public/Widgets/Images/SThrobber.h"
 #include "PythonEditorStyle.h"
 #include "PythonProjectEditor.h"
 #include "PythonProject.h"

diff --git a/Source/PythonEditor/Private/WhiteSpaceTextRun.h b/Source/PythonEditor/Private/WhiteSpaceTextRun.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "SlateTextRun.h"
+#include "Runtime/Slate/Public/Framework/Text/SlateTextRun.h"
 
 class FWhiteSpaceTextRun : public FSlateTextRun
 {