diff options
author | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
commit | 7283e6fb73490ddd23425ba2cf06cda7ac8f9458 (patch) | |
tree | 7c0c7069a44743b7462d3ed271bedeb09300ec4f /source/blender/makesdna/DNA_boid_types.h | |
parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/makesdna/DNA_boid_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_boid_types.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_boid_types.h b/source/blender/makesdna/DNA_boid_types.h index de93c734bb4..88b2c1e31b8 100644 --- a/source/blender/makesdna/DNA_boid_types.h +++ b/source/blender/makesdna/DNA_boid_types.h @@ -21,8 +21,7 @@ * \ingroup DNA */ -#ifndef __DNA_BOID_TYPES_H__ -#define __DNA_BOID_TYPES_H__ +#pragma once #include "DNA_listBase.h" @@ -223,5 +222,3 @@ typedef struct BoidSettings { //#define BOID_RULE_LAND (1 << 3) /* goal */ //#define BOID_RULE_WITH_BOIDS (1 << 4) /* avoid collision */ //#define BOID_RULE_WITH_DEFLECTORS (1 << 5) /* avoid collision */ - -#endif |