diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-18 00:56:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-18 00:56:25 +0400 |
commit | 48006292d8b3c6c8dd4bfe87bdbe271db93cffff (patch) | |
tree | ca98c07367717703c5a8801063cc42e0aff5b855 /intern/decimation/extern/LOD_decimation.h | |
parent | 4c66e696fbcaefe40f0394fea8fc4a55bb7d6994 (diff) | |
parent | 61596d5bb365a96b4b19adf0ef72ec1ea47212aa (diff) |
svn merge ^/trunk/blender -r44189:44204
Diffstat (limited to 'intern/decimation/extern/LOD_decimation.h')
-rw-r--r-- | intern/decimation/extern/LOD_decimation.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/decimation/extern/LOD_decimation.h b/intern/decimation/extern/LOD_decimation.h index 1c31e98f3da..4c52cb18577 100644 --- a/intern/decimation/extern/LOD_decimation.h +++ b/intern/decimation/extern/LOD_decimation.h @@ -38,8 +38,8 @@ * This is the external interface for the decimation module. */ -#ifndef NAN_INCLUDED_LOD_decimation_h -#define NAN_INCLUDED_LOD_decimation_h +#ifndef __LOD_DECIMATION_H__ +#define __LOD_DECIMATION_H__ #ifdef __cplusplus extern "C" { @@ -113,5 +113,5 @@ extern int LOD_FreeDecimationData(LOD_Decimation_InfoPtr); } #endif -#endif // NAN_INCLUDED_LOD_decimation_h +#endif // __LOD_DECIMATION_H__ |