diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-18 08:21:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-18 08:59:28 +0300 |
| commit | 333cdbb41025db012239e0549a439515880aad9b (patch) | |
| tree | 7f34b68d8d412bd69073eabee1ed01e2ded0437f /source/blender/imbuf/intern/dds | |
| parent | 93e876c4f89909ff1e399d7f038aac134367b120 (diff) | |
Cleanup: comment blocks
Diffstat (limited to 'source/blender/imbuf/intern/dds')
| -rw-r--r-- | source/blender/imbuf/intern/dds/BlockDXT.cpp | 18 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/dds/DirectDrawSurface.cpp | 6 |
2 files changed, 13 insertions, 11 deletions
diff --git a/source/blender/imbuf/intern/dds/BlockDXT.cpp b/source/blender/imbuf/intern/dds/BlockDXT.cpp index 9211f6a7ba6..f960faee1ab 100644 --- a/source/blender/imbuf/intern/dds/BlockDXT.cpp +++ b/source/blender/imbuf/intern/dds/BlockDXT.cpp @@ -53,9 +53,9 @@ #include <ColorBlock.h> #include <BlockDXT.h> -/*---------------------------------------------------------------------------- - BlockDXT1 -----------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------- + * BlockDXT1 + * --------------------------------------------------------------------------*/ uint BlockDXT1::evaluatePalette(Color32 color_array[4]) const { @@ -262,9 +262,9 @@ inline void BlockDXT1::flip2() swap(row[0], row[1]); } -/*---------------------------------------------------------------------------- - BlockDXT3 -----------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------- + * BlockDXT3 + * ---------------------------------------------------------------------------*/ void BlockDXT3::decodeBlock(ColorBlock *block) const { @@ -328,9 +328,9 @@ void BlockDXT3::flip2() color.flip2(); } -/*---------------------------------------------------------------------------- - BlockDXT5 -----------------------------------------------------------------------------*/ +/* --------------------------------------------------------------------------- + * BlockDXT5 + * ---------------------------------------------------------------------------*/ void AlphaBlockDXT5::evaluatePalette(uint8 alpha[8]) const { diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp index 3db9b65c461..89fe3bf5f25 100644 --- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp +++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp @@ -721,9 +721,11 @@ void DDSHeader::setPixelFormat(uint bitcount, uint rmask, uint gmask, uint bmask // D3DX functions do not like this: this->pf.fourcc = 0; //findD3D9Format(bitcount, rmask, gmask, bmask, amask); - /*if (this->pf.fourcc) { +#if 0 + if (this->pf.fourcc) { this->pf.flags |= DDPF_FOURCC; - }*/ + } +#endif if (!(bitcount > 0 && bitcount <= 32)) { printf("DDS: bad bit count, pixel format not set\n"); |