izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix 6-image array DDS files being imported as cubes

Browse Source 
#jira UE-162673
#rb fabian.giesen
#preflight none

[CL 21745696 by charles bloom in ue5-main branch]
This commit is contained in:
charles bloom
2022-09-01 15:16:01 -04:00
parent c7e4d4ce63
commit 21d02018d7
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Engine/Source/Runtime/ImageCore/Private/DDSFile.cpp
View File

@@ -448,13 +448,19 @@ EDDSError FDDSFile::Validate() const
// Cubemaps need to be square and have a valid array count
if (CreateFlags & CREATE_FLAG_CUBEMAP)
{
if (Dimension != 2 )
{
UE_LOG(LogDDSFile, Warning, TEXT("Cubemap must be dimension 2!"));
return EDDSError::BadCubemap;
}
if (Width != Height || Depth != 1)
{
UE_LOG(LogDDSFile, Warning, TEXT("Cubemap has non-square faces or non-1 depth!"));
return EDDSError::BadCubemap;
}
if ((ArraySize % 6) != 0)
if (ArraySize < 6 || (ArraySize % 6) != 0)
{
UE_LOG(LogDDSFile, Warning, TEXT("Cubemap or cubemap array doesn't have a multiple of 6 faces."));
return EDDSError::BadCubemap;
@@ -489,7 +495,7 @@ bool FDDSFile::IsValidTextureCube() const
return false;
}
if ( Dimension == 2 && ArraySize >= 6 && (ArraySize%6) == 0 )
if (CreateFlags & CREATE_FLAG_CUBEMAP)
{
return true;
}
@@ -503,7 +509,13 @@ bool FDDSFile::IsValidTextureArray() const
{
return false;
}
if (CreateFlags & CREATE_FLAG_CUBEMAP)
{
// don't identify cubes as arrays
return false;
}
if ( Dimension == 1 || Dimension == 2 )
{
if ( ArraySize > 1 )