diff options
author | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
commit | ef11238c743e6985fe325280fb13e05d6ec27378 (patch) | |
tree | 1dd2605a676bee52296535825b99f000a9c255eb /source/blender/imbuf/intern/dds/Common.h | |
parent | 1f768bbe4145daed111636ca09dd53b25b8d29b5 (diff) | |
parent | ec5f39208785c1bbe723054ffe69e1ac2ab470dd (diff) |
Merge branch 'master' into property-search-uiproperty-search-ui
Diffstat (limited to 'source/blender/imbuf/intern/dds/Common.h')
-rw-r--r-- | source/blender/imbuf/intern/dds/Common.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/dds/Common.h b/source/blender/imbuf/intern/dds/Common.h index 56f5d54cf42..90ec347a9ad 100644 --- a/source/blender/imbuf/intern/dds/Common.h +++ b/source/blender/imbuf/intern/dds/Common.h @@ -18,8 +18,7 @@ * \ingroup imbdds */ -#ifndef __COMMON_H__ -#define __COMMON_H__ +#pragma once #ifndef MIN # define MIN(a, b) ((a) <= (b) ? (a) : (b)) @@ -49,5 +48,3 @@ inline uint computePitch(uint w, uint bitsize, uint alignment) { return ((w * bitsize + 8 * alignment - 1) / (8 * alignment)) * alignment; } - -#endif |