From 93e035bac4e8741c57e2d0d853ff2843190dd772 Mon Sep 17 00:00:00 2001 From: aurel cordonnier Date: Thu, 10 Jun 2021 11:45:04 -0400 Subject: [PATCH] [Backout] - CL16609377 #fyi alexander.suvorov Original CL Desc ----------------------------------------------------------------- #jira UE-87812 Allow color adjustment for cubemaps created from longlat sources, use proper color space for imported HDR textures. #rb Julien.StJean #fyi charles.bloom #preflight 60ba698e884c6300012adbac [CL 16624208 by aurel cordonnier in ue5-main branch] --- .../TextureCompressor/Private/TextureCompressorModule.cpp | 1 + .../Editor/UnrealEd/Private/Factories/EditorFactories.cpp | 1 - Engine/Source/Runtime/Engine/Private/TextureDerivedData.cpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Engine/Source/Developer/TextureCompressor/Private/TextureCompressorModule.cpp b/Engine/Source/Developer/TextureCompressor/Private/TextureCompressorModule.cpp index 04598d89dd6f..7af1788a6956 100644 --- a/Engine/Source/Developer/TextureCompressor/Private/TextureCompressorModule.cpp +++ b/Engine/Source/Developer/TextureCompressor/Private/TextureCompressorModule.cpp @@ -2529,6 +2529,7 @@ private: { // Generate the base mip from the long-lat source image. GenerateBaseCubeMipFromLongitudeLatitude2D(Mip, Image, BuildSettings.MaxTextureResolution); + break; } else { diff --git a/Engine/Source/Editor/UnrealEd/Private/Factories/EditorFactories.cpp b/Engine/Source/Editor/UnrealEd/Private/Factories/EditorFactories.cpp index 7b44b4741134..44f496ed443d 100644 --- a/Engine/Source/Editor/UnrealEd/Private/Factories/EditorFactories.cpp +++ b/Engine/Source/Editor/UnrealEd/Private/Factories/EditorFactories.cpp @@ -3900,7 +3900,6 @@ UTexture* UTextureFactory::ImportTexture(UClass* Class, UObject* InParent, FName ); // the loader can suggest a compression setting TextureCube->CompressionSettings = TC_HDR; - TextureCube->SRGB = false; return TextureCube; } diff --git a/Engine/Source/Runtime/Engine/Private/TextureDerivedData.cpp b/Engine/Source/Runtime/Engine/Private/TextureDerivedData.cpp index 534267a4cb4b..91dea56458ad 100644 --- a/Engine/Source/Runtime/Engine/Private/TextureDerivedData.cpp +++ b/Engine/Source/Runtime/Engine/Private/TextureDerivedData.cpp @@ -50,7 +50,7 @@ // In case of merge conflicts with DDC versions, you MUST generate a new GUID and set this new // guid as version -#define TEXTURE_DERIVEDDATA_VER TEXT("B25F1A6FCA9440168B3A12C3BF5A943F") +#define TEXTURE_DERIVEDDATA_VER TEXT("E405EE6911174BB2A4B24BAC98C41448") // This GUID is mixed into DDC version for virtual textures only, this allows updating DDC version for VT without invalidating DDC for all textures // This is useful during development, but once large numbers of VT are present in shipped content, it will have the same problem as TEXTURE_DERIVEDDATA_VER