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 to Dev-Anim (//UE4/Dev-Anim) @ 4802313

Browse Source 
#rb
#rnx
#lockdown Laurent.Delayen

[CL 4803512 by Marc Audy in Dev-Anim branch]
This commit is contained in:
Marc Audy
2019-01-24 15:32:49 -05:00
parent 4f64d1a462
commit e5610adfd8
2721 changed files with 562707 additions and 11475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PyCore.cpp
View File

@@ -1,7 +1,6 @@
// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
#include "PyCore.h"
#include "PyUtil.h"
#include "PyGenUtil.h"
#include "PyReferenceCollector.h"
#include "PyWrapperTypeRegistry.h"

1
Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PyCore.h
View File

@@ -4,6 +4,7 @@
#include "IncludePython.h"
#include "PyConversion.h"
#include "PyUtil.h"
#include "PyWrapperBasic.h"
#include "PyPtr.h"
#include "CoreMinimal.h"

1
Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PyEngine.cpp
View File

@@ -1,7 +1,6 @@
// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
#include "PyEngine.h"
#include "PyUtil.h"
#include "PyGenUtil.h"
#include "PyWrapperTypeRegistry.h"

1
Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PyEngine.h
View File

@@ -5,6 +5,7 @@
#include "IncludePython.h"
#include "PyConversion.h"
#include "PyPtr.h"
#include "PyUtil.h"
#include "CoreMinimal.h"
#if WITH_PYTHON

3
Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PySlate.cpp
View File

@@ -3,7 +3,6 @@
#include "PySlate.h"
#include "PyGIL.h"
#include "PyCore.h"
#include "PyUtil.h"
#include "PyGenUtil.h"
#include "PyConversion.h"
#include "PyWrapperTypeRegistry.h"
@@ -147,7 +146,7 @@ PyObject* ParentExternalWindowToSlate(PyObject* InSelf, PyObject* InArgs)
return nullptr;
}
static const UEnum* ParentWindowSearchMethodEnum = FindObject<UEnum>(ANY_PACKAGE, TEXT("ESlateParentWindowSearchMethod"));
static const UEnum* ParentWindowSearchMethodEnum = StaticEnum<ESlateParentWindowSearchMethod>();
ESlateParentWindowSearchMethod ParentWindowSearchMethod = ESlateParentWindowSearchMethod::ActiveWindow;
if (PyParentWindowSearchMethod && !PyConversion::NativizeEnumEntry(PyParentWindowSearchMethod, ParentWindowSearchMethodEnum, ParentWindowSearchMethod))
{