Merge changes from The Witness.
This commit is contained in:
parent
897cc78397
commit
fea97461c5
|
@ -805,7 +805,7 @@ uint DDSHeader::pixelSize() const
|
||||||
return ::pixelSize((DXGI_FORMAT)header10.dxgiFormat);
|
return ::pixelSize((DXGI_FORMAT)header10.dxgiFormat);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (flags & DDPF_FOURCC) {
|
if (pf.flags & DDPF_FOURCC) {
|
||||||
return ::pixelSize((D3DFORMAT)pf.fourcc);
|
return ::pixelSize((D3DFORMAT)pf.fourcc);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user