Merge pull request #237 from AlienRenders/RMC4_UE5

Moddingear · web-flow · commit f0565da3fe16 · 2022-11-16T22:26:23.000+01:00
Fix UE 5.1 crash on startup.
diff --git a/Source/RuntimeMeshComponent/Private/RuntimeMesh.cpp b/Source/RuntimeMeshComponent/Private/RuntimeMesh.cpp
@@ -887,7 +887,7 @@ void URuntimeMesh::HandleSingleSectionUpdate(const FRuntimeMeshProxyPtr& RenderP
 		TSharedPtr<FRuntimeMeshSectionUpdateData> UpdateData = MakeShared<FRuntimeMeshSectionUpdateData>(MoveTemp(MeshData));
 
 		// Push the data to the gpu from this thread if we're not on the game thread and the current RHI supports async
-		if (GRHISupportsAsyncTextureCreation && GIsThreadedRendering && !IsInGameThread())
+		if (GRHISupportsAsyncTextureCreation && GIsThreadedRendering && IsInRenderingThread())
 		{
 			UpdateData->CreateRHIBuffers<false>(Properties.UpdateFrequency == ERuntimeMeshUpdateFrequency::Frequent);
 		}

Original file line number	Diff line number	Diff line change
`@@ -887,7 +887,7 @@ void URuntimeMesh::HandleSingleSectionUpdate(const FRuntimeMeshProxyPtr& RenderP`
`887`	`887`	`TSharedPtr<FRuntimeMeshSectionUpdateData> UpdateData = MakeShared<FRuntimeMeshSectionUpdateData>(MoveTemp(MeshData));`
`888`	`888`
`889`	`889`	`// Push the data to the gpu from this thread if we're not on the game thread and the current RHI supports async`
`890`		`- if (GRHISupportsAsyncTextureCreation && GIsThreadedRendering && !IsInGameThread())`
	`890`	`+ if (GRHISupportsAsyncTextureCreation && GIsThreadedRendering && IsInRenderingThread())`
`891`	`891`	`{`
`892`	`892`	`UpdateData->CreateRHIBuffers<false>(Properties.UpdateFrequency == ERuntimeMeshUpdateFrequency::Frequent);`
`893`	`893`	`}`