diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-07 07:59:16 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-07 07:59:16 +0300 |
| commit | e99094035c493a4e0bcb47b5cb9b1680b0e853c0 (patch) | |
| tree | 400f7af8c9d46edf757d6bbec0bce7199c676d83 /source/blender/makesdna/DNA_object_force_types.h | |
| parent | ce0f70fbd62fc812a2508c27a2f392cde0acbdfa (diff) | |
| parent | 38d35603f224e92c7f4dfe1802b0ebfceebec46a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_object_force_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_force_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_object_force_types.h b/source/blender/makesdna/DNA_object_force_types.h index 622e4e6a1b4..e7ebd3b72d7 100644 --- a/source/blender/makesdna/DNA_object_force_types.h +++ b/source/blender/makesdna/DNA_object_force_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef __DNA_OBJECT_FORCE_H__ -#define __DNA_OBJECT_FORCE_H__ +#ifndef __DNA_OBJECT_FORCE_TYPES_H__ +#define __DNA_OBJECT_FORCE_TYPES_H__ #ifdef __cplusplus extern "C" { @@ -459,5 +459,5 @@ typedef struct SoftBody { } #endif -#endif +#endif /* __DNA_OBJECT_FORCE_TYPES_H__ */ |