diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-21 09:46:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-21 09:46:41 +0400 |
| commit | f3ece5a108db0bdbefb4663ef4ebd9a7e039e263 (patch) | |
| tree | cb6329453be169ef1ec49ef8b8d50a6b14364880 /source/blender/imbuf/intern/dds | |
| parent | a1a0c8da13a7b91b0264c7535752864379f3d852 (diff) | |
style cleanup: trailing tabs & expand some non prefix tabs into spaces.
Diffstat (limited to 'source/blender/imbuf/intern/dds')
| -rw-r--r-- | source/blender/imbuf/intern/dds/BlockDXT.cpp | 4 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/dds/ColorBlock.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/dds/BlockDXT.cpp b/source/blender/imbuf/intern/dds/BlockDXT.cpp index f5e9e536e41..db2ca5969ec 100644 --- a/source/blender/imbuf/intern/dds/BlockDXT.cpp +++ b/source/blender/imbuf/intern/dds/BlockDXT.cpp @@ -232,7 +232,7 @@ void BlockDXT1::decodeBlock(ColorBlock * block) const uint idx = (row[j] >> (2 * i)) & 3; block->color(i, j) = color_array[idx]; } - } + } } void BlockDXT1::decodeBlockNV5x(ColorBlock * block) const @@ -592,7 +592,7 @@ void BlockCTX1::decodeBlock(ColorBlock * block) const uint idx = (row[j] >> (2 * i)) & 3; block->color(i, j) = color_array[idx]; } - } + } } void BlockCTX1::setIndices(int * idx) diff --git a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp index 0b9f5c163fb..dbd87bf1426 100644 --- a/source/blender/imbuf/intern/dds/ColorBlock.cpp +++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp @@ -393,7 +393,7 @@ void ColorBlock::computeRange(Vector3::Arg axis, Color32 * start, Color32 * end) int mini, maxi; mini = maxi = 0; - float min, max; + float min, max; min = max = dot(Vector3(m_color[0].r, m_color[0].g, m_color[0].b), axis); for (uint i = 1; i < 16; i++) |