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/simulation/intern/implicit.h | |
parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/simulation/intern/implicit.h')
-rw-r--r-- | source/blender/simulation/intern/implicit.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/simulation/intern/implicit.h b/source/blender/simulation/intern/implicit.h index 17dfb8b88b9..a3c8e5f34c4 100644 --- a/source/blender/simulation/intern/implicit.h +++ b/source/blender/simulation/intern/implicit.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __IMPLICIT_H__ -#define __IMPLICIT_H__ +#pragma once /** \file * \ingroup bph @@ -268,5 +267,3 @@ void SIM_hair_volume_vertex_grid_forces(struct HairGrid *grid, #ifdef __cplusplus } #endif - -#endif |