diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 01:08:30 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 01:08:30 +0300 |
commit | 66738d4aa017203caff067c41e25e28d62c3fd0b (patch) | |
tree | dee20ce0b0b6293812eeb76be279d9103297d60b /source/blender/imbuf/intern/dds/BlockDXT.cpp | |
parent | 95f2604ea7b32d034cce7c7ec46149eaf6174d47 (diff) | |
parent | 2083a7e274fefd4c82c8c52df87bc175e453c628 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf/intern/dds/BlockDXT.cpp')
-rw-r--r-- | source/blender/imbuf/intern/dds/BlockDXT.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/dds/BlockDXT.cpp b/source/blender/imbuf/intern/dds/BlockDXT.cpp index 7273ec1659c..0887576eedf 100644 --- a/source/blender/imbuf/intern/dds/BlockDXT.cpp +++ b/source/blender/imbuf/intern/dds/BlockDXT.cpp @@ -430,7 +430,7 @@ void AlphaBlockDXT5::decodeBlock(ColorBlock *block) const void AlphaBlockDXT5::flip4() { - uint64 * b = (uint64 *)this; + uint64 *b = (uint64 *)this; // @@ The masks might have to be byte swapped. uint64 tmp = (*b & (uint64)(0x000000000000FFFFLL)); @@ -444,7 +444,7 @@ void AlphaBlockDXT5::flip4() void AlphaBlockDXT5::flip2() { - uint * b = (uint *)this; + uint *b = (uint *)this; // @@ The masks might have to be byte swapped. uint tmp = (*b & 0xFF000000); |