izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merging //UE4/Dev-Main @ 4091196 to Dev-Core (//UE4/Dev-Core)

Browse Source 
#rb none

[CL 4093601 by Robert Manuszewski in Dev-Core branch]
This commit is contained in:
Robert Manuszewski
2018-05-25 05:45:28 -04:00
parent f4879062d5 bca116cacd
commit bd7535f69f
2548 changed files with 99781 additions and 102520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PyWrapperTypeRegistry.cpp
View File

@@ -2562,7 +2562,7 @@ void FPyWrapperTypeRegistry::GenerateStubCodeForWrappedType(PyTypeObject* PyType
bFirstEnumMember = false;
}
ExportConstantValue(UTF8_TO_TCHAR(EnumMember.EntryName.GetData()), UTF8_TO_TCHAR(EnumMember.EntryDoc.GetData()), *Lex::ToString(EnumMember.EntryValue));
ExportConstantValue(UTF8_TO_TCHAR(EnumMember.EntryName.GetData()), UTF8_TO_TCHAR(EnumMember.EntryDoc.GetData()), *LexToString(EnumMember.EntryValue));
}
}
}

6
Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PythonScriptPlugin.h
View File

@@ -8,6 +8,7 @@
#include "PyPtr.h"
#include "Misc/CoreMisc.h"
#include "HAL/IConsoleManager.h"
#include "Framework/Commands/InputChord.h"
class FPythonScriptPlugin;
@@ -31,7 +32,10 @@ public:
virtual bool Exec(const TCHAR* Input) override;
virtual bool AllowHotKeyClose() const override;
virtual bool AllowMultiLine() const override;
virtual FInputChord GetHotKey() const override
{
return FInputChord();
}
private:
FPythonScriptPlugin* PythonScriptPlugin;
};