Merge pull request 20tab#425 from rdsgautier/master

Roberto De Ioris · web-flow · commit f12180c44a74 · 2018-05-31T07:24:17.000+02:00
Fix Unreal 4.18 compilation
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.cpp b/Source/UnrealEnginePython/Private/UEPyEditor.cpp
@@ -634,10 +634,14 @@ PyObject *py_unreal_engine_rename_asset(PyObject * self, PyObject * args)
 	const FString PackagePath = FPackageName::GetLongPackagePath(u_object->GetOutermost()->GetName());
 	const FString newname(UTF8_TO_TCHAR(object_name));
 	new(AssetsAndNames) FAssetRenameData(u_object, PackagePath, newname);
+#if ENGINE_MINOR_VERSION < 19
+	AssetToolsModule.Get().RenameAssets(AssetsAndNames);
+#else
 	if (!AssetToolsModule.Get().RenameAssets(AssetsAndNames))
 	{
 		return PyErr_Format(PyExc_Exception, "unable to rename asset %s", path);
 	}
+#endif
 
 	Py_INCREF(Py_None);
 	return Py_None; 

Original file line number	Diff line number	Diff line change
`@@ -634,10 +634,14 @@ PyObject py_unreal_engine_rename_asset(PyObject self, PyObject * args)`
`634`	`634`	`const FString PackagePath = FPackageName::GetLongPackagePath(u_object->GetOutermost()->GetName());`
`635`	`635`	`const FString newname(UTF8_TO_TCHAR(object_name));`
`636`	`636`	`new(AssetsAndNames) FAssetRenameData(u_object, PackagePath, newname);`
	`637`	`+#if ENGINE_MINOR_VERSION < 19`
	`638`	`+ AssetToolsModule.Get().RenameAssets(AssetsAndNames);`
	`639`	`+#else`
`637`	`640`	`if (!AssetToolsModule.Get().RenameAssets(AssetsAndNames))`
`638`	`641`	`{`
`639`	`642`	`return PyErr_Format(PyExc_Exception, "unable to rename asset %s", path);`
`640`	`643`	`}`
	`644`	`+#endif`
`641`	`645`
`642`	`646`	`Py_INCREF(Py_None);`
`643`	`647`	`return Py_None;`