Skip to content

Commit da974eb

Browse files
committed
部分ue5升级错误修复
1 parent c35f849 commit da974eb

8 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎Source/PythonConsole/Private/PythonConsoleModule.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void FPythonConsoleModule::StartupModule()
7676
.SetDisplayName(NSLOCTEXT("UnrealEditor", "PythonLogTab", "Python Console"))
7777
.SetTooltipText(NSLOCTEXT("UnrealEditor", "PythonLogTooltipText", "Open the Python Console tab."))
7878
.SetGroup( WorkspaceMenu::GetMenuStructure().GetDeveloperToolsLogCategory() )
79-
.SetIcon( FSlateIcon(FEditorStyle::GetStyleSetName(), "Log.TabIcon") );
79+
.SetIcon( FSlateIcon(FAppStyle::GetAppStyleSetName(), "Log.TabIcon") );
8080

8181

8282
PythonLogHistory = MakeShareable(new FPythonLogHistory);

‎Source/PythonConsole/Private/SPythonConsole.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void SPythonConsole::Construct( const FArguments& InArgs, const EPythonConsoleSt
3737
.HeightOverride( 200.0f )
3838
[
3939
SNew( SBorder )
40-
.BorderImage( FEditorStyle::GetBrush( "ToolPanel.GroupBorder" ) )
40+
.BorderImage( FAppStyle::GetBrush( "ToolPanel.GroupBorder" ) )
4141
.ColorAndOpacity( this, &SPythonConsole::GetAnimatedColorAndOpacity )
4242
.BorderBackgroundColor( this, &SPythonConsole::GetAnimatedSlateColor )
4343
[
@@ -57,7 +57,7 @@ void SPythonConsole::Construct( const FArguments& InArgs, const EPythonConsoleSt
5757
[
5858
SNew( SBorder )
5959
.Padding( FMargin(2) )
60-
.BorderImage( FEditorStyle::GetBrush( "PythonConsole.Background" ) )
60+
.BorderImage( FAppStyle::GetBrush( "PythonConsole.Background" ) )
6161
.ColorAndOpacity( this, &SPythonConsole::GetAnimatedColorAndOpacity )
6262
.BorderBackgroundColor( this, &SPythonConsole::GetAnimatedSlateColor )
6363
[

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ static PyObject *py_ue_fpaint_context_draw_lines(ue_PyFPaintContext *self, PyObj
204204
if (!PyTuple_Check(py_item))
205205
{
206206
return PyErr_Format(PyExc_Exception, "iterable item is not a tuple");
207-
Py_DECREF(py_iter);
207+
/*Py_DECREF(py_iter);*/
208208
}
209209

210210
float x, y;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "Runtime/Slate/Public/Widgets/Docking/SDockTab.h"
99
#include "Runtime/Slate/Public/Widgets/Views/STableRow.h"
1010
#include "Runtime/Slate/Public/Framework/MultiBox/MultiBoxExtender.h"
11-
#include "AssetData.h"
11+
#include "AssetRegistry/AssetData.h"
1212

1313
void unreal_engine_py_log_error();
1414
template <typename T> T *ue_py_check_struct(PyObject *);

‎Source/UnrealEnginePython/Private/UEPyEditor.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "Developer/AssetTools/Public/AssetToolsModule.h"
77
#include "Editor/UnrealEd/Classes/Factories/Factory.h"
8-
#include "Runtime/AssetRegistry/Public/AssetRegistryModule.h"
8+
#include "AssetRegistry/AssetRegistryModule.h"
99
#include "Kismet2/KismetEditorUtilities.h"
1010
#include "Editor/ContentBrowser/Public/ContentBrowserModule.h"
1111
#include "Editor/UnrealEd/Public/PackageTools.h"
@@ -1143,7 +1143,7 @@ PyObject *py_unreal_engine_get_assets_by_class(PyObject * self, PyObject * args)
11431143
TArray<FAssetData> assets;
11441144

11451145
FAssetRegistryModule& AssetRegistryModule = FModuleManager::GetModuleChecked<FAssetRegistryModule>("AssetRegistry");
1146-
AssetRegistryModule.Get().GetAssetsByClass(UTF8_TO_TCHAR(path), assets, recursive);
1146+
AssetRegistryModule.Get().GetAssetsByClass(FTopLevelAssetPath(UTF8_TO_TCHAR(path)), assets, recursive);
11471147

11481148
PyObject *assets_list = PyList_New(0);
11491149

‎Source/UnrealEnginePython/Private/UObject/UEPyObject.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "Engine/UserDefinedEnum.h"
1111

1212
#if WITH_EDITOR
13-
#include "Runtime/AssetRegistry/Public/AssetRegistryModule.h"
13+
#include "AssetRegistry/AssetRegistryModule.h"
1414
#include "ObjectTools.h"
1515
#include "UnrealEd.h"
1616
#include "Runtime/Core/Public/HAL/FeedbackContextAnsi.h"

‎Source/UnrealEnginePython/Private/Wrappers/UEPyFARFilter.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#if WITH_EDITOR
55

6-
#include "AssetRegistryModule.h"
7-
#include "Runtime/AssetRegistry/Public/ARFilter.h"
6+
#include "AssetRegistry/AssetRegistryModule.h"
7+
#include "AssetRegistry/ARFilter.h"
88

99
typedef struct
1010
{

‎Source/UnrealEnginePython/Private/Wrappers/UEPyFSoftSkinVertex.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static int py_ue_fsoft_skin_vertex_set_influence_bones(ue_PyFSoftSkinVertex *sel
160160

161161
static PyObject *py_ue_fsoft_skin_vertex_get_influence_weights(ue_PyFSoftSkinVertex *self, void *closure)
162162
{
163-
uint8 *data = self->ss_vertex.InfluenceWeights;
163+
uint16 *data = self->ss_vertex.InfluenceWeights;
164164
return Py_BuildValue((char*)"(iiiiiiii)", data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
165165
}
166166

0 commit comments

Comments
 (0)