fixed 4.27 build

rdeioris · Jul 6, 2023 · 0a2df52 · 0a2df52
1 parent bd6323c
commit 0a2df52
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Source/glTFRuntime/Private/glTFRuntimeParserMaterials.cpp b/Source/glTFRuntime/Private/glTFRuntimeParserMaterials.cpp
@@ -1398,12 +1398,12 @@ void FglTFRuntimeDDS::LoadMips(const int32 TextureIndex, TArray<FglTFRuntimeMipM
 
 int32 FglTFRuntimeTextureMipDataProvider::GetMips(const FTextureUpdateContext& Context, int32 StartingMipIndex, const FTextureMipInfoArray& MipInfos, const FTextureUpdateSyncOptions& SyncOptions)
 {
-#if ENGINE_MAJOR_VERSION == 4
+#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 27
 	const int32 CurrentFirstLODIdx = Context.CurrentFirstMipIndex;
 #endif
 	for (int32 MipIndex = StartingMipIndex; MipIndex < CurrentFirstLODIdx; MipIndex++)
 	{
-#if ENGINE_MAJOR_VERSION >= 5
+#if ENGINE_MAJOR_VERSION >= 5 || ENGINE_MINOR_VERSION >= 27
 		const FTexture2DMipMap& MipMap = *Context.MipsView[MipIndex];
 #else
 		// pretty brutal (we are always assuming UTexture2D), but should be safe

diff --git a/Source/glTFRuntime/Public/glTFRuntimeParser.h b/Source/glTFRuntime/Public/glTFRuntimeParser.h
@@ -1297,7 +1297,7 @@ struct FglTFRuntimeMipMap
 class FglTFRuntimeTextureMipDataProvider : public FTextureMipDataProvider
 {
 public:
-#if ENGINE_MAJOR_VERSION >= 5
+#if ENGINE_MAJOR_VERSION >= 5 || ENGINE_MINOR_VERSION >= 27
 	FglTFRuntimeTextureMipDataProvider(const UTexture* Texture, ETickState InTickState, ETickThread InTickThread) : FTextureMipDataProvider(Texture, InTickState, InTickThread)
 #else
 	FglTFRuntimeTextureMipDataProvider(ETickState InTickState, ETickThread InTickThread) : FTextureMipDataProvider(InTickState, InTickThread)
@@ -1340,12 +1340,16 @@ class UglTFRuntimeTextureMipDataProviderFactory : public UTextureMipDataProvider
 	GENERATED_BODY()
 
 public:
-#if ENGINE_MAJOR_VERSION >= 5
+#if ENGINE_MAJOR_VERSION >= 5 || ENGINE_MINOR_VERSION >= 27
 	virtual FTextureMipDataProvider* AllocateMipDataProvider(UTexture* Asset) { return new FglTFRuntimeTextureMipDataProvider(Asset, FTextureMipDataProvider::ETickState::Init, FTextureMipDataProvider::ETickThread::Async); }
-	virtual bool WillProvideMipDataWithoutDisk() const override { return true; }
 #else
 	virtual FTextureMipDataProvider* AllocateMipDataProvider() { return new FglTFRuntimeTextureMipDataProvider(FTextureMipDataProvider::ETickState::Init, FTextureMipDataProvider::ETickThread::Async); }
 #endif
+
+#if ENGINE_MAJOR_VERSION >= 5
+	virtual bool WillProvideMipDataWithoutDisk() const override { return true; }
+#endif
+
 };
 
 struct FglTFRuntimeTextureTransform