More non-FProperty updates from Support4.25 pull request patched in.

David · David · commit ed3499cc2164 · 2020-06-28T23:04:40.000+01:00
diff --git a/Source/UnrealEnginePython/Private/UObject/UEPyCapture.cpp b/Source/UnrealEnginePython/Private/UObject/UEPyCapture.cpp
@@ -118,8 +118,16 @@ struct FInEditorMultiCapture : TSharedFromThis<FInEditorMultiCapture>
 		UGameViewportClient::OnViewportCreated().AddRaw(this, &FInEditorMultiCapture::OnStart);
 		FEditorDelegates::EndPIE.AddRaw(this, &FInEditorMultiCapture::OnEndPIE);
 
-		FAudioDevice* AudioDevice = GEngine->GetMainAudioDevice();
-		if (AudioDevice != nullptr)
+		//Use auto because UE4.25 changed type, but type has same interface
+		auto AudioDevice = GEngine->GetMainAudioDevice();
+
+#if ENGINE_MINOR_VERSION >= 25
+		bool bIsDeviceValid = AudioDevice.IsValid();
+#else
+		bool bIsDeviceValid = (AudioDevice != nullptr);
+#endif
+
+		if (bIsDeviceValid)
 		{
 			TransientMasterVolume = AudioDevice->GetTransientMasterVolume();
 			AudioDevice->SetTransientMasterVolume(0.0f);
@@ -278,8 +286,16 @@ struct FInEditorMultiCapture : TSharedFromThis<FInEditorMultiCapture>
 
 		FObjectReader(GetMutableDefault<ULevelEditorPlaySettings>(), BackedUpPlaySettings);
 
-		FAudioDevice* AudioDevice = GEngine->GetMainAudioDevice();
-		if (AudioDevice != nullptr)
+		//Use auto because UE4.25 changed type, but type has same interface
+		auto AudioDevice = GEngine->GetMainAudioDevice();
+
+#if ENGINE_MINOR_VERSION >= 25
+		bool bIsDeviceValid = AudioDevice.IsValid();
+#else
+		bool bIsDeviceValid = (AudioDevice != nullptr);
+#endif
+
+		if (bIsDeviceValid)
 		{
 			AudioDevice->SetTransientMasterVolume(TransientMasterVolume);
 		}
diff --git a/Source/UnrealEnginePython/Private/Wrappers/UEPyFEditorViewportClient.cpp b/Source/UnrealEnginePython/Private/Wrappers/UEPyFEditorViewportClient.cpp
@@ -105,8 +105,24 @@ static PyObject *py_ue_feditor_viewport_client_set_realtime(ue_PyFEditorViewport
 	if (!PyArg_ParseTuple(args, "OO", &bInRealtime, &bStoreCurrentValue))
 		return nullptr;
 
+#if ENGINE_MINOR_VERSION >= 25
+	// UE4.25 split this setting to 2 separate functions
+	if (PyObject_IsTrue(bStoreCurrentValue))
+	{
+		//Persist across editor sessions
+		self->editor_viewport_client->SetRealtime(PyObject_IsTrue(bInRealtime) ? true : false);
+	}
+	else
+	{
+		//Don't persist across editor sessions
+		FText OverrideSourceText;
+		OverrideSourceText.FromString(TEXT("UnrealEnginePython plugin script"));
+		self->editor_viewport_client->SetRealtimeOverride(PyObject_IsTrue(bInRealtime) ? true : false, OverrideSourceText);
+	}
+#else
 	self->editor_viewport_client->SetRealtime(PyObject_IsTrue(bInRealtime) ? true : false,
 		PyObject_IsTrue(bStoreCurrentValue) ? true : false);
+#endif
 	Py_RETURN_NONE;
 }
 
@@ -195,4 +211,4 @@ PyObject *py_ue_new_feditor_viewport_client(TSharedRef<FEditorViewportClient> ed
 	new(&ret->editor_viewport_client) TSharedRef<FEditorViewportClient>(editor_viewport_client);
 	return (PyObject *)ret;
 }
-#endif
+#endif
diff --git a/Source/UnrealEnginePython/Private/Wrappers/UEPyFRawMesh.h b/Source/UnrealEnginePython/Private/Wrappers/UEPyFRawMesh.h
@@ -5,7 +5,12 @@
 
 #if ENGINE_MINOR_VERSION > 13
 
+#if ENGINE_MINOR_VERSION < 25
 #include "Developer/RawMesh/Public/RawMesh.h"
+#else
+#include "Runtime/RawMesh/Public/RawMesh.h"
+#endif
+
 
 struct ue_PyFRawMesh
 {
diff --git a/Source/UnrealEnginePython/Private/Wrappers/UEPyFSoftSkinVertex.cpp b/Source/UnrealEnginePython/Private/Wrappers/UEPyFSoftSkinVertex.cpp
@@ -89,7 +89,11 @@ static int py_ue_fsoft_skin_vertex_set_tangent_z(ue_PyFSoftSkinVertex *self, PyO
 
 static PyObject *py_ue_fsoft_skin_vertex_get_influence_bones(ue_PyFSoftSkinVertex *self, void *closure)
 {
-	uint8 *data = self->ss_vertex.InfluenceBones;
+#if ENGINE_MINOR_VERSION >= 25
+	uint16* data = self->ss_vertex.InfluenceBones;
+#else
+	uint8* data = self->ss_vertex.InfluenceBones;
+#endif
 	return Py_BuildValue((char*)"(iiiiiiii)", data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,11 @@ static int py_ue_fsoft_skin_vertex_set_tangent_z(ue_PyFSoftSkinVertex *self, PyO`
`89`	`89`
`90`	`90`	`static PyObject py_ue_fsoft_skin_vertex_get_influence_bones(ue_PyFSoftSkinVertex self, void *closure)`
`91`	`91`	`{`
`92`		`- uint8 *data = self->ss_vertex.InfluenceBones;`
	`92`	`+#if ENGINE_MINOR_VERSION >= 25`
	`93`	`+ uint16* data = self->ss_vertex.InfluenceBones;`
	`94`	`+#else`
	`95`	`+ uint8* data = self->ss_vertex.InfluenceBones;`
	`96`	`+#endif`
`93`	`97`	`return Py_BuildValue((char*)"(iiiiiiii)", data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);`
`94`	`98`	`}`
`95`	`99`