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

Copying //UE4/Dev-RenderPlat-Staging[at]8684824 to Dev-Main (//UE4/Dev-Main)

Browse Source 
#rb none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 8684840 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v436-8951088)

This still contains some ARRAY_COUNT deprecation warnings but we will fix those next

[CL 8974328 by stefan boberg in Dev-Core branch]
This commit is contained in:
stefan boberg
2019-09-23 08:42:45 -04:00
parent 96980eb606
commit 74bec8d909
1060 changed files with 50751 additions and 119644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Engine/Source/Developer/TextureFormatASTC/Private/TextureFormatASTC.cpp
View File

@@ -420,7 +420,7 @@ public:
{
OutCompressedImage.SizeX = Image.SizeX;
OutCompressedImage.SizeY = Image.SizeY;
OutCompressedImage.SizeZ = BuildSettings.bVolume ? Image.NumSlices : 1;
OutCompressedImage.SizeZ = (BuildSettings.bVolume || BuildSettings.bTextureArray) ? Image.NumSlices : 1;
OutCompressedImage.PixelFormat = CompressedPixelFormat;
}
return bCompressionSucceeded;